diff --git a/modules/global/nix.nix b/modules/global/nix.nix
index 404bf9c..fb00f51 100644
--- a/modules/global/nix.nix
+++ b/modules/global/nix.nix
@@ -10,7 +10,7 @@ in
 
     settings = {
       allowed-users = [ "*" ];
-      trusted-users = [ "root" "@wheel" "remotebuild" ];
+      trusted-users = [ "root" "@wheel" "remotebuild" "nix-ssh" ];
 
       system-features = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
       experimental-features = [ "flakes" "nix-command" "impure-derivations" "no-url-literals" ];
@@ -64,6 +64,12 @@ in
     extraOptions = ''
       builders-use-substitutes = true
     '';
+
+    sshServe = {
+      enable = mkDefault true;
+      write = true;
+      keys = config.user.openssh.authorizedKeys.keys;
+    };
   };
 
   nixpkgs.config = {
diff --git a/modules/modules/services/nix-ssh-serve.nix b/modules/modules/services/nix-ssh-serve.nix
deleted file mode 100644
index 1d3eeb5..0000000
--- a/modules/modules/services/nix-ssh-serve.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ config, lib, ... }:
-with lib;
-{
-  nix = {
-    sshServe = {
-      enable = mkDefault true;
-      write = true;
-      keys = config.user.openssh.authorizedKeys.keys;
-    };
-
-    settings.trusted-users = [ "nix-ssh" ];
-  };
-}