diff --git a/flake.lock b/flake.lock
index 626ef9b..413df9b 100755
--- a/flake.lock
+++ b/flake.lock
@@ -23,15 +23,16 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1731235328,
-        "narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=",
-        "owner": "nix-community",
+        "lastModified": 1735820701,
+        "narHash": "sha256-pr4HFkp/TqgGrVKKedQU+lZQwSQuX1JhqnJyyHxMhyE=",
+        "owner": "msyds",
         "repo": "home-manager",
-        "rev": "60bb110917844d354f3c18e05450606a435d2d10",
+        "rev": "6948b7bc94c020d6292ef69f699cf37b9683eec9",
         "type": "github"
       },
       "original": {
-        "owner": "nix-community",
+        "owner": "msyds",
+        "ref": "service-mpdscribble",
         "repo": "home-manager",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 84fcd34..6e08ac2 100755
--- a/flake.nix
+++ b/flake.nix
@@ -8,7 +8,9 @@
 
     impermanence.url = "github:nix-community/impermanence";
 
-    home-manager.url = "github:nix-community/home-manager";
+    # We're using my branch until #6259 is merged.
+    home-manager.url = "github:msyds/home-manager/service-mpdscribble";
+    # home-manager.url = "path:///persist/dots/DELETE-ME/home-manager";
 
     niri.url = "github:sodiboo/niri-flake";
 
diff --git a/modules/home/mpd.nix b/modules/home/mpd.nix
index f6a1fa1..b52d2c7 100644
--- a/modules/home/mpd.nix
+++ b/modules/home/mpd.nix
@@ -62,18 +62,9 @@ in {
       enable = true;
     };
 
-    # services.mpdscribble = mkIf cfg.scrobbling.enable {
-    #   enable = true;
-    #   endpoints = {
-    #     "last.fm" = {
-    #       passwordFile = "/etc/insecure-bullshit/lastfm-password.lol";
-    #       username = "crumb1";
-    #     };
-    #     "libre.fm" = {
-    #       passwordFile = "/etc/insecure-bullshit/librefm-password.lol";
-    #       username = "crumbtoo";
-    #     };
-    #   };
-    # };
+    services.mpdscribble = mkIf cfg.scrobbling.enable {
+      enable = true;
+      endpoints = cfg.scrobbling.endpoints;
+    };
   };
 }
diff --git a/users/crumb/default.nix b/users/crumb/default.nix
index b12ec05..9e3c235 100755
--- a/users/crumb/default.nix
+++ b/users/crumb/default.nix
@@ -18,30 +18,9 @@
       sops = {
         enable = true;
         keyFile = "/persist/user-files/${config.home.username}/key.txt";
-        secrets = {
-          lastfm-password = {};
-          librefm-password = {};
-        };
-      };
-
-      mpd = {
-        enable = true;
-        scrobbling.endpoints = {
-          "last.fm" = {
-            passwordFile = config.sydnix.sops.secrets.lastfm-password.path;
-            username = "crumb1";
-          };
-          "libre.fm" = {
-            passwordFile = config.sydnix.sops.secrets.librefm-password.path;
-            username = "crumbtoo";
-          };
-        };
       };
     };
 
-    home.packages = [
-    ];
-
     # Don't touch!
     home.stateVersion = "18.09";
   };
diff --git a/users/crumb/programs/mpd.nix b/users/crumb/programs/mpd.nix
new file mode 100644
index 0000000..6e1c031
--- /dev/null
+++ b/users/crumb/programs/mpd.nix
@@ -0,0 +1,28 @@
+{ config, lib, pkgs, ... }:
+
+{
+  sydnix.sops.secrets = {
+    lastfm-password = {};
+    librefm-password = {};
+  };
+
+  sydnix.mpd = {
+    enable = true;
+    scrobbling.endpoints = {
+      "last.fm" = {
+        passwordFile =
+          "/home/crumb/.config/sops-nix/secrets/lastfm-password";
+        username = "crumb1";
+      };
+      "libre.fm" = {
+        passwordFile =
+          "/home/crumb/.config/sops-nix/secrets/librefm-password";
+        username = "crumbtoo";
+      };
+    };
+  };
+
+  # mpdscribble uses our password files, so it is imperative that the service
+  # runs only after said password files are brought into existence. }:)
+  systemd.user.services.mpdscribble.Unit.After = [ "sops-nix.service" ];
+}