diff --git a/nixos/modules/cosmic.nix b/nixos/modules/cosmic.nix
deleted file mode 100755
index 2c4be49..0000000
--- a/nixos/modules/cosmic.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  nix.settings = {
-    substituters = [
-      "https://cosmic.cachix.org/"
-    ];
-    trusted-public-keys = [
-      "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE="
-    ];
-  };
-
-  environment.sessionVariables.COSMIC_DATA_CONTROL_ENABLED = 1;
-  services = {
-    desktopManager.cosmic.enable = true;
-    displayManager.cosmic-greeter.enable = true;
-  };
-}
diff --git a/nixos/modules/ssh.nix b/nixos/modules/ssh.nix
index 34932f0..7e08fdb 100755
--- a/nixos/modules/ssh.nix
+++ b/nixos/modules/ssh.nix
@@ -15,13 +15,13 @@ let
     devices
     ;
   hostname = config.networking.hostName;
-  desktop = devices.desktop.name;
-  fallaryn = devices.fallaryn.name;
+  user0devices = devices.desktop.name || devices.server.name;
+  user2devices = devices.fallaryn.name;
 
   userLogic =
-    if hostname == desktop then
+    if hostname == user0devices then
       user0
-    else if hostname == fallaryn then
+    else if hostname == user2devices then
       user2
     else
       "";