diff --git a/hosts/dnsc-air/default.nix b/hosts/dnsc-air/default.nix
index 093c28b..8f2a68a 100644
--- a/hosts/dnsc-air/default.nix
+++ b/hosts/dnsc-air/default.nix
@@ -60,8 +60,6 @@
     fnm
     imagemagick
     restic
-    emacs-macport
-    coreutils-prefixed
   ];
 
   # Homebrew
diff --git a/hosts/dnsc-server/default.nix b/hosts/dnsc-server/default.nix
index 441a2bc..67731f2 100644
--- a/hosts/dnsc-server/default.nix
+++ b/hosts/dnsc-server/default.nix
@@ -124,14 +124,18 @@
   };
 
   # Root SSH
-  programs.ssh.extraConfig = ''
-    Host dnsc-storage
-      Port 23
-      IdentitiesOnly yes
-      User u295965
-      HostName u295965.your-storagebox.de
-      IdentityFile /root/.ssh/id_ed25519
-  '';
+  programs.ssh = {
+    enable = true;
+    matchBlocks = {
+      "dnsc-storage" = {
+        hostname = "u295965.your-storagebox.de";
+        user = "u295965";
+        identityFile = "/root/.ssh/id_ed25519";
+        identitiesOnly = true;
+        port = 23;
+      };
+    };
+  };
 
   # Services
   # ZFS