diff --git a/hosts/cube/default.nix b/hosts/cube/default.nix
index 414efae..8cb2b68 100644
--- a/hosts/cube/default.nix
+++ b/hosts/cube/default.nix
@@ -9,12 +9,9 @@
 
   environment.etc.machine-id.source = "/var/lib/nixos/machine-id";
 
-  services.openssh = {
-    enable = true;
-    hostKeys = [
-      { type = "ed25519"; path = "/var/lib/nixos/ssh_host_ed25519_key"; }
-    ];
-  };
+  services.openssh.hostKeys = [
+    { type = "ed25519"; path = "/var/lib/nixos/ssh_host_ed25519_key"; }
+  ];
 
   users.mutableUsers = false;
   users.users.sean.passwordFile = "/var/lib/nixos/shadow_sean";
diff --git a/hosts/hp/default.nix b/hosts/hp/default.nix
index 489f2a2..81fd8af 100644
--- a/hosts/hp/default.nix
+++ b/hosts/hp/default.nix
@@ -12,12 +12,9 @@
   environment.etc."NetworkManager/system-connections".source =
     "/var/lib/nixos/nm-connections";
 
-  services.openssh = {
-    enable = true;
-    hostKeys = [
-      { type = "ed25519"; path = "/var/lib/nixos/ssh_host_ed25519_key"; }
-    ];
-  };
+  services.openssh.hostKeys = [
+    { type = "ed25519"; path = "/var/lib/nixos/ssh_host_ed25519_key"; }
+  ];
 
   users.mutableUsers = false;
   users.users.sean.passwordFile = "/var/lib/nixos/shadow_sean";
diff --git a/hosts/lenny/default.nix b/hosts/lenny/default.nix
index d7e4a03..b1508dc 100644
--- a/hosts/lenny/default.nix
+++ b/hosts/lenny/default.nix
@@ -10,12 +10,9 @@
 
   systemd.tmpfiles.rules = [ "d /var/lib/nixos/network-connections 0700" ];
 
-  services.openssh = {
-    enable = true;
-    hostKeys = [
-      { type = "ed25519"; path = "/var/lib/nixos/ssh_host_ed25519_key"; }
-    ];
-  };
+  services.openssh.hostKeys = [
+    { type = "ed25519"; path = "/var/lib/nixos/ssh_host_ed25519_key"; }
+  ];
 
   users.mutableUsers = false;
   users.users.root.passwordFile = "/nix/persist/shadow_sean";
diff --git a/hosts/nixdev/default.nix b/hosts/nixdev/default.nix
index daf1ecc..5896492 100644
--- a/hosts/nixdev/default.nix
+++ b/hosts/nixdev/default.nix
@@ -11,8 +11,6 @@
 
   services.qemuGuest.enable = true;
 
-  services.openssh.enable = true;
-
   users.mutableUsers = false;
   users.users.root.passwordFile = "/nix/persist/shadow_sean";
   users.users.sean.passwordFile = "/nix/persist/shadow_sean";
diff --git a/modules/baseline.nix b/modules/baseline.nix
index 612eec9..a8dd9d4 100644
--- a/modules/baseline.nix
+++ b/modules/baseline.nix
@@ -41,6 +41,7 @@
   };
 
   services = {
+    openssh.enable = true;
     openssh.startWhenNeeded = true;
     earlyoom.enable = true;
 
diff --git a/modules/profiles/server.nix b/modules/profiles/server.nix
index a3435b1..cb9f3b7 100644
--- a/modules/profiles/server.nix
+++ b/modules/profiles/server.nix
@@ -3,7 +3,6 @@ with lib;
 {
   config = mkIf (config.sconfig.profile == "server") {
     services.logind.lidSwitch = "ignore";
-    services.openssh.enable = true;
     documentation.nixos.enable = false;
     nix.gc = {
       automatic = true;