diff --git a/homeModules/programs/ssh/default.nix b/homeModules/programs/ssh/default.nix
index 220c00df..a4bef138 100644
--- a/homeModules/programs/ssh/default.nix
+++ b/homeModules/programs/ssh/default.nix
@@ -8,54 +8,39 @@ in
     programs.ssh = {
       enable = true;
       enableDefaultConfig = false;
-      matchBlocks = {
+      settings = {
         "*" = {
-          forwardAgent = false;
-          addKeysToAgent = "no";
-          serverAliveInterval = 0;
-          serverAliveCountMax = 3;
-          hashKnownHosts = false;
-          userKnownHostsFile = "~/.ssh/known_hosts";
-          controlMaster = "no";
-          controlPath = "~/.ssh/master-%r@%n:%p";
-          controlPersist = "no";
-          compression = true;
+          ForwardAgent = false;
+          AddKeysToAgent = "no";
+          ServerAliveInterval = 0;
+          ServerAliveCountMax = 3;
+          HashKnownHosts = false;
+          UserKnownHostsFile = "~/.ssh/known_hosts";
+          ControlMaster = "no";
+          ControlPath = "~/.ssh/master-%r@%n:%p";
+          ControlPersist = "no";
+          Compression = true;
         };
         "marvin" = {
-          hostname = "100.123.15.72";
-          user = "thehedgehog";
-          port = 22;
-          extraOptions = {
-            "IdentitiesOnly" = "no";
-            "PreferredAuthentications" = "publickey";
-          };
-        };
-        "prefect-old" = {
-          hostname = "100.93.63.54";
-          user = "thehedgehog";
-          port = 22;
-          extraOptions = {
-            "IdentitiesOnly" = "no";
-            "PreferredAuthentications" = "publickey";
-          };
+          Hostname = "100.123.15.72";
+          User = "thehedgehog";
+          Port = 22;
+          IdentitiesOnly = false;
+          PreferredAuthentications = "publickey";
         };
         "prefect" = {
-          hostname = "100.107.252.71";
-          user = "thehedgehog";
-          port = 22;
-          extraOptions = {
-            "IdentitiesOnly" = "no";
-            "PreferredAuthentications" = "publickey";
-          };
+          Hostname = "100.107.252.71";
+          User = "thehedgehog";
+          Port = 22;
+          IdentitiesOnly = false;
+          PreferredAuthentications = "publickey";
         };
         "test-vm" = {
-          hostname = "localhost";
-          user = "root";
-          port = 2222;
-          extraOptions = {
-            StrictHostKeyChecking = "no";
-            "PreferredAuthentications" = "password";
-          };
+          Hostname = "localhost";
+          User = "root";
+          Port = 2222;
+          StrictHostKeyChecking = false;
+          PreferredAuthentications = "password";
         };
       };
       extraOptionOverrides = {