diff --git a/home/config/ssh/default.nix b/home/config/ssh/default.nix
new file mode 100644
index 0000000..063ca31
--- /dev/null
+++ b/home/config/ssh/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./pvv.nix
+    ./other.nix
+  ];
+}
diff --git a/home/config/ssh/other.nix b/home/config/ssh/other.nix
new file mode 100644
index 0000000..f77ea66
--- /dev/null
+++ b/home/config/ssh/other.nix
@@ -0,0 +1,10 @@
+{ lib, ... }:
+{
+  programs.ssh.matchBlocks = {
+    "pascal wack" = {
+      user = "h7x4";
+      hostname = "wiki.wackattack.eu";
+      port = 1337;
+    };
+  };
+}
diff --git a/home/config/ssh/hosts/pvv.nix b/home/config/ssh/pvv.nix
similarity index 87%
rename from home/config/ssh/hosts/pvv.nix
rename to home/config/ssh/pvv.nix
index b4f215a..aeec737 100644
--- a/home/config/ssh/hosts/pvv.nix
+++ b/home/config/ssh/pvv.nix
@@ -7,7 +7,16 @@ let
     [ "hildring" "pvv-login" "pvv" ]
     "demiurgen"
     "eirin"
-    [ "jokum" "pvv-nix" ]
+    "bekkalokk"
+    "ildkule"
+    "shark"
+    "buskerud"
+    "bicep"
+    {
+      names = [ "bob" ];
+      proxyJump = "hildring";
+    }
+    "knutsen"
     "isvegg"
     [ "microbel" "pvv-users" "pvv-mail" ]
   ];
@@ -16,18 +25,17 @@ let
     [ "knakelibrak" "pvv-databases" ]
     [ "spikkjeposche" "pvv-web" "pvv-wiki" "pvv-webmail" ]
     "sleipner"
-    "fenris"
+    # "fenris"
     "balduzius"
     "joshua"
-    "skrotnisse"
+    # "skrotnisse"
     "principal"
     "tom"
-    "monty"
-
-    {
-      names = ["dvask"];
-      proxyJump = "monty";
-    }
+    # "monty"
+    # {
+    #   names = [ "dvask" ];
+    #   proxyJump = "monty";
+    # }
 
     [ "innovation" "pvv-minecraft" ]
   ];
@@ -44,7 +52,7 @@ let
     inherit (lib.lists) head;
     inherit (lib.strings) split;
   in
-    names: { hostname = "${head names}.pvv.org"; };
+    names: { hostname = "${head names}.pvv.ntnu.no"; };
 
   # AttrSet -> AttrSet -> AttrSet
   convertMachineWithDefaults = defaults: normalizedMachine: let
diff --git a/home/home.nix b/home/home.nix
index cdca812..1843b83 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -8,7 +8,7 @@ in {
     ./shell.nix
     ./packages.nix
 
-    ./config/ssh/hosts/pvv.nix
+    ./config/ssh
     ./config/xdg
 
     ./programs/atuin.nix