diff --git a/nix/modules/ssh.nix b/nix/modules/ssh.nix
index 4c8fde2..1adf4bc 100644
--- a/nix/modules/ssh.nix
+++ b/nix/modules/ssh.nix
@@ -1,10 +1,20 @@
+{ config, lib, ... }:
+let
+  cfg = config.flake;
+  inherit (lib.modules) mkMerge;
+  inherit (cfg.lib.modules) forAllUsers';
+in
 {
-  flake.modules.nixos.default = {
-    persistFiles = [
-      "/etc/ssh/ssh_host_ed25519_key"
-      "/etc/ssh/ssh_host_ed25519_key.pub"
-      "/etc/ssh/ssh_host_rsa_key"
-      "/etc/ssh/ssh_host_rsa_key.pub"
-    ];
-  };
+  flake.modules.nixos.default = mkMerge [
+    {
+      persistFiles = [
+        "/etc/ssh/ssh_host_ed25519_key"
+        "/etc/ssh/ssh_host_ed25519_key.pub"
+        "/etc/ssh/ssh_host_rsa_key"
+        "/etc/ssh/ssh_host_rsa_key.pub"
+      ];
+      users.users = forAllUsers' (_: value: { openssh.authorizedKeys.keys = [ value.pubkey ]; });
+    }
+    { users.users.root.openssh.authorizedKeys.keys = [ cfg.admin.pubkey ]; }
+  ];
 }
diff --git a/nix/modules/users.nix b/nix/modules/users.nix
index 2c1a5c9..b9ab8f7 100644
--- a/nix/modules/users.nix
+++ b/nix/modules/users.nix
@@ -11,8 +11,6 @@ in
       #TODO: move sudo/security options elsewhere
       # security.sudo.wheelNeedsPassword = false;
       # nix.settings.trusted-users = [ "@wheel" ];
-      #TODO: move ssh key settings elsewhere
-      # users.users.root.openssh.authorizedKeys.keys = [ owner.pubkey ];
       # persist uids and gids
       persistDirs = [ "/var/lib/nixos" ];
       users = {
@@ -23,7 +21,6 @@ in
             isNormalUser = true;
             hashedPasswordFile = config.sops.secrets."${name}/hashedPassword".path;
             extraGroups = optional (value.primary or false) "wheel";
-            openssh.authorizedKeys.keys = [ value.pubkey ];
           }
         );
       };