diff --git a/configs/mcp.nix b/configs/mcp.nix
index e0de34a..8353b08 100644
--- a/configs/mcp.nix
+++ b/configs/mcp.nix
@@ -4,13 +4,9 @@
 # and a systemd service for the agent daemon.
 { pkgs, ... }:
 
-let
-  mcpUid = 995;
-in
 {
   users.users.mcp = {
     isSystemUser = true;
-    uid = mcpUid; # Pin UID so systemd Environment references stay stable.
     group = "mcp";
     home = "/srv/mcp";
     shell = pkgs.shadow; # nologin equivalent
@@ -42,7 +38,7 @@ in
       Group = "mcp";
       Environment = [
         "HOME=/srv/mcp"
-        "XDG_RUNTIME_DIR=/run/user/${toString mcpUid}"
+        "XDG_RUNTIME_DIR=/run/user/%U"
         "PATH=/run/current-system/sw/bin:/usr/local/bin"
       ];