diff --git a/modules/baseline.nix b/modules/baseline.nix
index d005443..473c5ec 100644
--- a/modules/baseline.nix
+++ b/modules/baseline.nix
@@ -38,15 +38,17 @@
     '';
   };
 
-  services.xserver = {
-    libinput.mouse.middleEmulation = false;
-    deviceSection = ''
-      Option "VariableRefresh" "true"
-    '';
-  };
-
   services = {
+    openssh.startWhenNeeded = true;
     earlyoom.enable = true;
+
+    xserver = {
+      libinput.mouse.middleEmulation = false;
+      deviceSection = ''
+        Option "VariableRefresh" "true"
+      '';
+    };
+
     avahi = {
       enable = true;
       nssmdns = true;
diff --git a/modules/profiles/server.nix b/modules/profiles/server.nix
index 2896b4a..9a10c70 100644
--- a/modules/profiles/server.nix
+++ b/modules/profiles/server.nix
@@ -4,7 +4,6 @@ with lib;
   config = mkIf (config.sconfig.profile == "server") {
     services.logind.lidSwitch = "ignore";
     services.openssh.enable = true;
-    services.openssh.startWhenNeeded = true;
     documentation.nixos.enable = false;
     nix.gc = {
       automatic = true;