diff --git a/flake.lock b/flake.lock
index 4c75bacc..e19c92ce 100644
--- a/flake.lock
+++ b/flake.lock
@@ -220,6 +220,29 @@
         "type": "github"
       }
     },
+    "fenix": {
+      "inputs": {
+        "nixpkgs": [
+          "nix-autobahn",
+          "nixpkgs"
+        ],
+        "rust-analyzer-src": "rust-analyzer-src"
+      },
+      "locked": {
+        "lastModified": 1659940224,
+        "narHash": "sha256-FZRcZu4eOz3WCe/RroMFPfvZmje83zKYlY+mydXjAJQ=",
+        "ref": "main",
+        "rev": "cfcc0eb48484890882e83372db1d5fdc6a0e0f67",
+        "revCount": 1129,
+        "type": "git",
+        "url": "https://github.com/nix-community/fenix"
+      },
+      "original": {
+        "ref": "main",
+        "type": "git",
+        "url": "https://github.com/nix-community/fenix"
+      }
+    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -482,6 +505,7 @@
     },
     "nix-autobahn": {
       "inputs": {
+        "fenix": "fenix",
         "naersk": [
           "naersk"
         ],
@@ -491,16 +515,15 @@
         "utils": "utils_2"
       },
       "locked": {
-        "lastModified": 1649006172,
-        "narHash": "sha256-GoKQ4Zx5ABmi2unSnJNwR5o/zO6OHBg/8E6XapxwWFw=",
-        "owner": "pub-solar",
+        "lastModified": 1655761558,
+        "narHash": "sha256-BGKT0RQGJ1CtTssfPhI4PABV1Gh6Wyq/cf6GN30TUAY=",
+        "owner": "wucke13",
         "repo": "nix-autobahn",
-        "rev": "e10aaa55ee1f6985a82791279b39e7b04353f8c5",
+        "rev": "85861fdd5cc32b65e75db4e6be478fe2da455dba",
         "type": "github"
       },
       "original": {
-        "owner": "pub-solar",
-        "ref": "fix/clap-and-bump-dependencies",
+        "owner": "wucke13",
         "repo": "nix-autobahn",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 1b0c9db4..40bc6ef1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -54,7 +54,7 @@
       tritonshell.url = "git+https://git.greenbaum.cloud/dev/tritonshell?ref=main&dir=template";
       tritonshell.inputs.nixpkgs.follows = "latest";
 
-      nix-autobahn.url = "github:pub-solar/nix-autobahn/fix/clap-and-bump-dependencies";
+      nix-autobahn.url = "github:wucke13/nix-autobahn";
       nix-autobahn.inputs.nixpkgs.follows = "latest";
       nix-autobahn.inputs.naersk.follows = "naersk";
     };
diff --git a/users/teutat3s/home.nix b/users/teutat3s/home.nix
index 7ae2c49e..a439f67d 100644
--- a/users/teutat3s/home.nix
+++ b/users/teutat3s/home.nix
@@ -45,7 +45,7 @@ in
         veracrypt
         waypoint
         yubikey-agent
-        nix-autobahn.packages.${pkgs.system}.nix-autobahn
+        nix-autobahn.packages.${pkgs.system}.default
       ];
 
       programs.zsh = {