diff --git a/flake.lock b/flake.lock
index 989d18ac..2cfc4209 100644
--- a/flake.lock
+++ b/flake.lock
@@ -78,11 +78,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1689516967,
-        "narHash": "sha256-sFAa33wkQHanmij/uhfGduIDK8z4dJAita/rK6u9pvE=",
+        "lastModified": 1689825754,
+        "narHash": "sha256-u3W3WGO3BA63nb+CeNLBajbJ/sl8tDXBHKxxeTOCxfo=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "61662a63bfe1726588c1da6b412df86d8ca94d63",
+        "rev": "531c3de7eccf95155828e0cd9f18c25e7f937777",
         "type": "github"
       },
       "original": {
@@ -175,11 +175,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1689495092,
-        "narHash": "sha256-yZu2j5FpLZEPhJQQutMCPTxa1VMigLPabLYvLTq6ASM=",
+        "lastModified": 1689875525,
+        "narHash": "sha256-fgUrFH3bMZ6R7qgBTfuTRGlkZXIkdyjndl6ZbExbjE8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2f84579a70b8c74e5ebb37299a0c3ba279f09382",
+        "rev": "1443abd2696ec6bd6fb9701e6c26b277a27b4a3e",
         "type": "github"
       },
       "original": {
@@ -274,11 +274,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1689444953,
-        "narHash": "sha256-0o56bfb2LC38wrinPdCGLDScd77LVcr7CrH1zK7qvDg=",
+        "lastModified": 1689679375,
+        "narHash": "sha256-LHUC52WvyVDi9PwyL1QCpaxYWBqp4ir4iL6zgOkmcb8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "8acef304efe70152463a6399f73e636bcc363813",
+        "rev": "684c17c429c42515bafb3ad775d2a710947f3d67",
         "type": "github"
       },
       "original": {
@@ -330,11 +330,11 @@
     "pypi-deps-db": {
       "flake": false,
       "locked": {
-        "lastModified": 1685526402,
-        "narHash": "sha256-V0SXx0dWlUBL3E/wHWTszrkK2dOnuYYnBc7n6e0+NQU=",
+        "lastModified": 1689774708,
+        "narHash": "sha256-36Zwo1G2oi+Gg3Cpp3EOwDzBkmpqyRlzL8OLBN2rgu4=",
         "owner": "DavHau",
         "repo": "pypi-deps-db",
-        "rev": "ba35683c35218acb5258b69a9916994979dc73a9",
+        "rev": "944094e4184b4079298d44a7697118f998288964",
         "type": "github"
       },
       "original": {
diff --git a/nixos/roles/irc-client/nginx.nix b/nixos/roles/irc-client/nginx.nix
new file mode 100644
index 00000000..e38126d3
--- /dev/null
+++ b/nixos/roles/irc-client/nginx.nix
@@ -0,0 +1,14 @@
+_: {
+  services.nginx = {
+    virtualHosts = {
+      "irc.kittywit.ch" = {
+        enableACME = true;
+        forceSSL = true;
+        locations."/" = {
+          proxyPass = "http://[::1]:9000";
+          proxyWebsockets = true;
+        };
+      };
+    };
+  };
+}
diff --git a/nixos/roles/irc-client.nix b/nixos/roles/irc-client/thelounge.nix
similarity index 100%
rename from nixos/roles/irc-client.nix
rename to nixos/roles/irc-client/thelounge.nix
diff --git a/nixos/roles/matrix-homeserver/nginx.nix b/nixos/roles/matrix-homeserver/nginx.nix
index 6702a4e8..a16c4898 100644
--- a/nixos/roles/matrix-homeserver/nginx.nix
+++ b/nixos/roles/matrix-homeserver/nginx.nix
@@ -13,13 +13,6 @@
 in {
   services.nginx = {
     virtualHosts = {
-      "kittywit.ch" = {
-        enableACME = true;
-        forceSSL = true;
-        acmeRoot = null;
-        locations."= /.well-known/matrix/server".extraConfig = mkWellKnown serverConfig;
-        locations."= /.well-known/matrix/client".extraConfig = mkWellKnown clientConfig;
-      };
       "${fqdn}" = {
         enableACME = true;
         forceSSL = true;
diff --git a/systems/default.nix b/systems/default.nix
index 5b1683bc..c1972e52 100644
--- a/systems/default.nix
+++ b/systems/default.nix
@@ -142,19 +142,19 @@
           magicRollback = true;
         };
       })
-      (set.optional (name != "renko") {
+      (set.optional (name != "renko" && host.folder == "nixos") {
         ${name} = {
           hostname = "${name}.inskip.me";
           sshUser = "deploy";
-          sshOpts = ["-p" "${builtins.toString (builtins.head inputs.self.nixosConfigurations.${name}.config.services.openssh.ports)}"];
+          sshOpts = ["-oControlMaster=no" "-oControlPath=/tmp/willneverexist" "-p" "${builtins.toString (builtins.head inputs.self.nixosConfigurations.${name}.config.services.openssh.ports)}"];
         };
       })
-      (set.optional (name == "renko") {
+      (set.optional (name == "renko" && host.folder == "nixos") {
         ${name} = {
           sshUser = "nixos";
           hostname = "orb";
           fastConnection = true;
-          sshOpts = ["-p" "32222"];
+          sshOpts = ["-oControlMaster=no" "-oControlPath=/tmp/willneverexist" "-p" "32222"];
         };
       })
     ];