diff --git a/hosts/hivebrain/default.nix b/hosts/hivebrain/default.nix
index c25c256..b565d14 100644
--- a/hosts/hivebrain/default.nix
+++ b/hosts/hivebrain/default.nix
@@ -10,10 +10,8 @@
     ../../system/locale.nix
     ../../system/fonts.nix
     ../../system/nix.nix
-    ../../system/ssh.nix
     ../../system/programs.nix
     ../../system/packages.nix
-    ../../system/docker.nix
 
     # marvin-only
     ../../system/xserver.nix
@@ -26,5 +24,8 @@
   networking.hostName = "hivebrain";
   system.stateVersion = "26.05";
 
+  services.openssh.enable = true;
+  virtualisation.docker.enable = true;
+
   programs.steam.enable = true;
 }
diff --git a/hosts/nikita-nixos/default.nix b/hosts/nikita-nixos/default.nix
index 2d64ec9..35f187d 100644
--- a/hosts/nikita-nixos/default.nix
+++ b/hosts/nikita-nixos/default.nix
@@ -14,11 +14,12 @@
     ../../system/packages.nix
 
     # nikita-only
-    ../../system/plasma.nix
-    ../../system/display-managers/sddm.nix
     ../../system/users/nikita.nix
   ];
 
   networking.hostName = "nikita-nixos";
   system.stateVersion = "26.05";
+
+  services.displayManager.sddm.enable = true;
+  services.desktopManager.plasma6.enable = true;
 }
diff --git a/system/display-managers/sddm.nix b/system/display-managers/sddm.nix
deleted file mode 100644
index 1cfa22b..0000000
--- a/system/display-managers/sddm.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ ... }:
-
-{
-  services.displayManager.sddm.enable = true;
-}
diff --git a/system/docker.nix b/system/docker.nix
deleted file mode 100644
index 2ea1048..0000000
--- a/system/docker.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ ... }:
-
-{
-    virtualisation.docker.enable = true;
-}
-
diff --git a/system/plasma.nix b/system/plasma.nix
deleted file mode 100644
index d543256..0000000
--- a/system/plasma.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ ... }:
-
-{
-  services.desktopManager.plasma6.enable = true;
-}
diff --git a/system/ssh.nix b/system/ssh.nix
deleted file mode 100644
index f29c3fe..0000000
--- a/system/ssh.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ ... }:
-
-{
-  services.openssh.enable = true;
-}