diff --git a/flake.lock b/flake.lock
index 91f19d71..d44f202e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -8,11 +8,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1654842375,
-        "narHash": "sha256-Mfx2Pz+ulZA6Vpa5HuOOpvDZf8sVUhfODNEEK0BsIq0=",
+        "lastModified": 1655360770,
+        "narHash": "sha256-McgGUL3AqYL+mFtthSXC4ugWBqI/yXKId8wxpeBWsNY=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "ccd2a0808b160e7236bcc0c89749ec5b44749703",
+        "rev": "720b54260dee864d2a21745bd2bb55223f58e297",
         "type": "github"
       },
       "original": {
@@ -74,7 +74,7 @@
       "locked": {
         "lastModified": 1654728826,
         "narHash": "sha256-DE8aYLwqm2ouaj6pPrCD2NLgU1Tv3nBTtbpNmstQEoQ=",
-        "ref": "master",
+        "ref": "refs/heads/master",
         "rev": "3cf6d131f8b7515e93739a70d1cffc24973ed220",
         "revCount": 55,
         "type": "git",
@@ -96,11 +96,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1654014175,
-        "narHash": "sha256-x9Qppzv5uic14v23T46AicjELIMG+jrqNspcosFa0MQ=",
+        "lastModified": 1655384771,
+        "narHash": "sha256-kmgN7D7tUC3Ki70D+rdS19PW/lrANlU3tc8gu5gsld0=",
         "owner": "nixos",
         "repo": "hydra",
-        "rev": "cf9f38e43fd81f9298e3f2ff50c8a6ee0acc3af0",
+        "rev": "fb26435fe9a54f13143e69a545b8f3cecffaed96",
         "type": "github"
       },
       "original": {
@@ -133,11 +133,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1654475993,
-        "narHash": "sha256-bGymMoL5Ut7KC9y2zO7/14y01xUqmSehbig2yBl8Sxw=",
+        "lastModified": 1655153792,
+        "narHash": "sha256-cDBDbvqh/5qlhC8goE+/A+AeBpPlD/fOIAvhLsqCslA=",
         "owner": "astro",
         "repo": "microvm.nix",
-        "rev": "322acf99b1520ae803f84f2bfa305231adedc344",
+        "rev": "85adc1701842cd9bc494dc0a78871f92a1af416e",
         "type": "github"
       },
       "original": {
@@ -153,11 +153,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1654608517,
-        "narHash": "sha256-KIxHjDDJYhoiLanLjpeAk5AuZsfip8M62JhkuloEGb0=",
+        "lastModified": 1655042882,
+        "narHash": "sha256-9BX8Fuez5YJlN7cdPO63InoyBy7dm3VlJkkmTt6fS1A=",
         "owner": "nix-community",
         "repo": "naersk",
-        "rev": "14997a79cd78fe34ad6390f18a327ee0593e5eec",
+        "rev": "cddffb5aa211f50c4b8750adbec0bbbdfb26bb9f",
         "type": "github"
       },
       "original": {
@@ -210,16 +210,18 @@
         "nixpkgs-regression": "nixpkgs-regression"
       },
       "locked": {
-        "lastModified": 1649172203,
-        "narHash": "sha256-Q3nYaXqbseDOvZrlePKeIrx0/KzqyrtNpxHIUbtFHuI=",
+        "lastModified": 1654014617,
+        "narHash": "sha256-qNL3lQPBsnStkru3j1ajN/H+knXI+X3dku8/dBfSw3g=",
         "owner": "NixOS",
         "repo": "nix",
-        "rev": "5fe4fe823c193cbb7bfa05a468de91eeab09058d",
+        "rev": "624e38aa43f304fbb78b4779172809add042b513",
         "type": "github"
       },
       "original": {
-        "id": "nix",
-        "type": "indirect"
+        "owner": "NixOS",
+        "ref": "2.9.1",
+        "repo": "nix",
+        "type": "github"
       }
     },
     "nixos-hardware": {
@@ -333,11 +335,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1654847188,
-        "narHash": "sha256-MC+eP7XOGE1LAswOPqdcGoUqY9mEQ3ZaaxamVTbc0hM=",
+        "lastModified": 1655401542,
+        "narHash": "sha256-YZDOYf0RAr1CKnWr3Z7VopgyZ+NcvudebcMjxUqz8CA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "8b66e3f2ebcc644b78cec9d6f152192f4e7d322f",
+        "rev": "760ed64f2377ba1bebb563cb07eccd9f636e3df2",
         "type": "github"
       },
       "original": {
@@ -371,11 +373,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1654715602,
-        "narHash": "sha256-BAODQJXIJrGDdN7Jpt0/FoOlgYV73V4zS5vOPq9CmHI=",
+        "lastModified": 1654890849,
+        "narHash": "sha256-x1VbquYehnJQO6KjwjBPuH6h0WDFsEG6LkmQUjLkSBM=",
         "owner": "astro",
         "repo": "nix-openwrt-imagebuilder",
-        "rev": "120225861687239f5268b6643f9c088e62ecae32",
+        "rev": "81dfe7ffb90b46192833d485755e7c6219cdbe43",
         "type": "github"
       },
       "original": {
@@ -431,11 +433,11 @@
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1654700117,
-        "narHash": "sha256-x3rF4IMwZUYnwF3JUnJvtIJmixrYkrl74K9EjhJMSr8=",
+        "lastModified": 1655323297,
+        "narHash": "sha256-PYcTKb/hpSTMytTbtVT6pWIw0SJmyXnqEWDkuRs/uqY=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "79a4a464b07d626de17bd4b5f2382b5634644f7d",
+        "rev": "519d7484f3b1beb25dec9f2249adeaaa21033433",
         "type": "github"
       },
       "original": {
@@ -467,7 +469,7 @@
       "locked": {
         "lastModified": 1647380283,
         "narHash": "sha256-OJkUm4bJrgaZeaKvvE1VCmrAn/cxV62Nvv0o22A6GGc=",
-        "ref": "master",
+        "ref": "refs/heads/master",
         "rev": "81db905da940ebd02c446f9c9e1127406f3c136b",
         "revCount": 44,
         "type": "git",
@@ -490,7 +492,7 @@
       "locked": {
         "lastModified": 1655147612,
         "narHash": "sha256-4rUNfhp/mdc5lURACsw7I5oe67I/wRpKOq6oPx6M36s=",
-        "ref": "master",
+        "ref": "refs/heads/master",
         "rev": "6fb0e5a2b19f0d409e8cb27b52fffe1b345a4ad5",
         "revCount": 129,
         "type": "git",
@@ -551,7 +553,7 @@
       "locked": {
         "lastModified": 1654302837,
         "narHash": "sha256-si7fkF0fZHRWZ5M6Bn8gaR4owO+hfBEB1imIVQbNc8k=",
-        "ref": "master",
+        "ref": "refs/heads/master",
         "rev": "f41172d3c5ce1690cad1db66a1a57ff62060ae0b",
         "revCount": 90,
         "type": "git",
@@ -615,18 +617,18 @@
         ]
       },
       "locked": {
-        "lastModified": 1615990851,
-        "narHash": "sha256-XAQZK6Zzke0WG9U0YEIs8qqa7gmnyTYnNKUSEDRmNOM=",
+        "lastModified": 1655412349,
+        "narHash": "sha256-EFJLSOCajkfLteSWaEv5b16Xp2YhKa4CVdkC9ZjKowc=",
         "ref": "nix",
-        "rev": "63191180a5b4c0d9b2b2781f3fbd5f5f478ea04f",
-        "revCount": 404,
+        "rev": "e7069228a87c42124e7762b1bfd663b684e24749",
+        "revCount": 405,
         "type": "git",
-        "url": "https://gitea.c3d2.de/astro/yammat.git"
+        "url": "https://gitea.c3d2.de/C3D2/yammat.git"
       },
       "original": {
         "ref": "nix",
         "type": "git",
-        "url": "https://gitea.c3d2.de/astro/yammat.git"
+        "url": "https://gitea.c3d2.de/C3D2/yammat.git"
       }
     },
     "zentralwerk": {
@@ -645,11 +647,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1654816522,
-        "narHash": "sha256-dK6fFI0H9YEuI9SfFm88KINtykiLXwxQy1w3D71ipUQ=",
-        "ref": "master",
-        "rev": "22e4e19a5b74e33661b4e524280ad956da001830",
-        "revCount": 1411,
+        "lastModified": 1654890860,
+        "narHash": "sha256-kuD2G1GZLPyQNB0fHJ2x0kvUHLUHyeSaIPniaJkxXfA=",
+        "ref": "refs/heads/master",
+        "rev": "bd340c7e616e5b6b1d07bd75ea3292f1d917475e",
+        "revCount": 1419,
         "type": "git",
         "url": "https://gitea.c3d2.de/zentralwerk/network.git"
       },
diff --git a/flake.nix b/flake.nix
index 46f2d1d7..fa2d6126 100644
--- a/flake.nix
+++ b/flake.nix
@@ -70,7 +70,7 @@
       flake = false;
     };
     yammat = {
-      url = "git+https://gitea.c3d2.de/astro/yammat.git?ref=nix";
+      url = "git+https://gitea.c3d2.de/C3D2/yammat.git?ref=nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     zentralwerk = {