diff --git a/nixos/tako/services/matrix/tuwunel.nix b/nixos/tako/services/matrix/tuwunel.nix
index c1bf9aa6..7bb04ffa 100644
--- a/nixos/tako/services/matrix/tuwunel.nix
+++ b/nixos/tako/services/matrix/tuwunel.nix
@@ -18,6 +18,43 @@
     };
   };
   cinnyConfigFile = pkgs.writeText "cinny-config.json" cinnyConfig;
+  cinny = with pkgs;
+    buildNpmPackage rec {
+      pname = "cinny-unwrapped";
+      version = "4.10.5";
+
+      src = fetchFromGitHub {
+        owner = "cinnyapp";
+        repo = "cinny";
+        tag = "v${version}";
+        hash = "sha256-Napy3AcsLRDZPcBh3oq1U30FNtvoNtob0+AZtZSvcbM=";
+      };
+
+      nodejs = nodejs_22;
+
+      npmDepsHash = "sha256-2Lrd0jAwAH6HkwLHyivqwaEhcpFAIALuno+MchSIfxo=";
+
+      nativeBuildInputs = [
+        python3
+        pkg-config
+      ];
+
+      buildInputs =
+        [
+          pixman
+          cairo
+          pango
+        ]
+        ++ lib.optionals stdenv.hostPlatform.isDarwin [giflib];
+
+      installPhase = ''
+        runHook preInstall
+
+        cp -r dist $out
+
+        runHook postInstall
+      '';
+    };
 in {
   sops = {
     secrets."tuwunel/client_id" = {
@@ -80,7 +117,7 @@ in {
         root ${cinnyConfigFile}
       }
       handle {
-          root * ${pkgs.cinny}
+          root * ${cinny}
           try_files {path} /index.html
           file_server
       }
diff --git a/overlays.nix b/overlays.nix
index 48c293d7..bd83b801 100644
--- a/overlays.nix
+++ b/overlays.nix
@@ -9,7 +9,6 @@
     };
   };
   misc-applications = final: prev: {
-    command-runner = inputs.command-runner.packages.${prev.system}.command-runner;
     goread = final.pkgs.buildGoModule {
       pname = "goread";
       version = "v1.6.4";