diff --git a/flake.lock b/flake.lock
index 92197e83..bde21317 100644
--- a/flake.lock
+++ b/flake.lock
@@ -12,7 +12,7 @@
       "locked": {
         "lastModified": 1663176622,
         "narHash": "sha256-ahmQXwS2P34x7PxXt8Ve2ZVKJHW6yP1m/nZoo8sHwmE=",
-        "ref": "master",
+        "ref": "refs/heads/master",
         "rev": "b56ed86e45b2a8cdf811f2659644192a69ab5818",
         "revCount": 293,
         "type": "git",
@@ -91,11 +91,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1668535353,
-        "narHash": "sha256-cVe++C4wg2CG80qjjSVG4H1udcRi7sbdU/xMGC5WSxc=",
+        "lastModified": 1668798814,
+        "narHash": "sha256-JBXKQ/l0PmuJe3bBkLdICMX3CXG5GatyacuxnTY43RU=",
         "ref": "main",
-        "rev": "a12dc753b3f3d145883e1de7a0c12407bbe97288",
-        "revCount": 111,
+        "rev": "91dcf74609695490cc83961518bacc269710296f",
+        "revCount": 128,
         "type": "git",
         "url": "https://gitea.c3d2.de/astro/caveman.git"
       },
@@ -113,11 +113,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1668493618,
-        "narHash": "sha256-Pw8dzHPI3My/nWthhWlD6nVLVPDAi9+NODvayVhKGKk=",
+        "lastModified": 1668839162,
+        "narHash": "sha256-kGpqBpxEbzy/AEEKia2Hd5swMou2Pl9ATAviSTQy/NM=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "3e59a48c3171664ea0797f28273f9929a2335617",
+        "rev": "16ba830351ba5e7c018919e8c70ef31350755f42",
         "type": "github"
       },
       "original": {
@@ -175,7 +175,7 @@
       "locked": {
         "lastModified": 1657923513,
         "narHash": "sha256-YzHPow09B9uSdybUxP5lQn2hXk90Q6oTDL6UXzD0/+k=",
-        "ref": "master",
+        "ref": "refs/heads/master",
         "rev": "f7cf04a7ad47e388121f0771651fec0df91407f3",
         "revCount": 61,
         "type": "git",
@@ -349,11 +349,11 @@
     },
     "nixos": {
       "locked": {
-        "lastModified": 1668459637,
-        "narHash": "sha256-HqnWCKujmtu8v0CjzOT0sr7m2AR7+vpbZJOp1R0rodY=",
+        "lastModified": 1668766498,
+        "narHash": "sha256-UjZlIrbHGlL3H3HZNPTxPSwJfr49jIfbPWCYxk0EQm4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "16f4e04658c2ab10114545af2f39db17d51bd1bd",
+        "rev": "f42a45c015f28ac3beeb0df360e50cdbf495d44b",
         "type": "github"
       },
       "original": {
@@ -396,11 +396,11 @@
     },
     "nixos-unstable": {
       "locked": {
-        "lastModified": 1668417584,
-        "narHash": "sha256-yeuEyxKPwsm5fIHN49L/syn9g5coxnPp3GsVquhrv5A=",
+        "lastModified": 1668765800,
+        "narHash": "sha256-rC40+/W6Hio7b/RsY8SvQPKNx4WqNcTgfYv8cUMAvJk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "013fcdd106823416918004bb684c3c186d3c460f",
+        "rev": "52b2ac8ae18bbad4374ff0dd5aeee0fdf1aea739",
         "type": "github"
       },
       "original": {
@@ -511,11 +511,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1668458369,
-        "narHash": "sha256-Mv4F2AgOIpGyvfoHQtw/sDg3hU7O0K1P9ercnfrwnEQ=",
+        "lastModified": 1668803963,
+        "narHash": "sha256-GmxUN70JXUkAabbJ+qG3A/eHwYf6576twU6nVct291M=",
         "owner": "astro",
         "repo": "nix-openwrt-imagebuilder",
-        "rev": "818db40dd8a0a22b029823ba477c5c3301bd7534",
+        "rev": "bd49940936c490c99c7a7f7b23b74edbd5f2f0d8",
         "type": "github"
       },
       "original": {
@@ -562,11 +562,11 @@
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1668182250,
-        "narHash": "sha256-PYGaOCiFvnJdVz+ZCaKF8geGdffXjJUNcMwaBHv0FT4=",
+        "lastModified": 1668800018,
+        "narHash": "sha256-v2fKKwMFOhc0iTAbrzybwOwmgaO76eYuBOiFkPcd0rU=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "45ec315e01dc8dd1146dfeb65f0ef6e5c2efed78",
+        "rev": "791cb87cdf47ddfd2a2b1a726dab3aa66ec2bff3",
         "type": "github"
       },
       "original": {
@@ -586,11 +586,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1668479979,
-        "narHash": "sha256-UI+JUCBaMpn+5Y1hSePmndbYX5zu0+bavlfzrhPrGEk=",
+        "lastModified": 1668825399,
+        "narHash": "sha256-F2ro05D6tGMwSaOYeIediJq6X0ATD7JgWEG2TgOs9Wo=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "2342f70f7257046effc031333c4cfdea66c91d82",
+        "rev": "a705fe51ef5cdf932ff1cb342f0fe9e5d66f1b71",
         "type": "github"
       },
       "original": {
@@ -604,7 +604,7 @@
       "locked": {
         "lastModified": 1665446321,
         "narHash": "sha256-GuZr+BCAIe+UYmQrLHaVr8iRRajn5nSdWyqhjWDIX1Y=",
-        "ref": "master",
+        "ref": "refs/heads/master",
         "rev": "3700761dd06f271ef26261ed2a90dce8c22b6dca",
         "revCount": 61,
         "type": "git",
@@ -624,7 +624,7 @@
       "locked": {
         "lastModified": 1659890996,
         "narHash": "sha256-xURgGoznCPmpX35dn5AXcyNYicVn5ruvUKxfIMMiu8o=",
-        "ref": "master",
+        "ref": "refs/heads/master",
         "rev": "5ca106f648bef15d9954d956bda336eea28e8d75",
         "revCount": 149,
         "type": "git",
@@ -743,7 +743,7 @@
       "locked": {
         "lastModified": 1666559258,
         "narHash": "sha256-m4f5QQbE+usnEnM6CJ+nCgXcsi9mm0cCwFm2BhJ0pvQ=",
-        "ref": "master",
+        "ref": "refs/heads/master",
         "rev": "22ecb2b375bebffdfb1af3435a4c4486e6dd923b",
         "revCount": 108,
         "type": "git",
@@ -785,7 +785,7 @@
       "locked": {
         "lastModified": 1663279525,
         "narHash": "sha256-lUq4CY//ISplh/4i33nOU7cchpxKrw5V8mVdRnHMBaA=",
-        "ref": "master",
+        "ref": "refs/heads/master",
         "rev": "6d8d2cb1268d26add05baa3f21c325cfe051add3",
         "revCount": 342,
         "type": "git",
@@ -830,11 +830,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1668554331,
-        "narHash": "sha256-QExvepHzH2QtHjeu1ZG2gIWh3bOxwsNsO2SBVmGIlRo=",
-        "ref": "master",
-        "rev": "9cb7dbc38595e7c213d193f2adf3cbeffcded74b",
-        "revCount": 1669,
+        "lastModified": 1668626855,
+        "narHash": "sha256-plm+TYOcTpiTBax50vGN+qJmbm0cztMj+UNaBkKVpws=",
+        "ref": "refs/heads/master",
+        "rev": "fe9e0fea91dc31396cbdb349b010ebd9d04cd607",
+        "revCount": 1670,
         "type": "git",
         "url": "https://gitea.c3d2.de/zentralwerk/network.git"
       },
diff --git a/flake.nix b/flake.nix
index 41097be5..070db61d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -948,7 +948,7 @@
 
         gnunet = nixosSystem' {
           modules = [
-            self.nixosModules.microvm
+            self.nixosModules.cluster-options
             ./hosts/gnunet
           ];
           nixpkgs = nixos-unstable;
diff --git a/hosts/gnunet/default.nix b/hosts/gnunet/default.nix
index a1b50b92..f3c224b6 100644
--- a/hosts/gnunet/default.nix
+++ b/hosts/gnunet/default.nix
@@ -2,11 +2,11 @@
   system.stateVersion = "22.05";
 
   c3d2.hq.statistics.enable = true;
-  c3d2.deployment = {
-    server = "server10";
-    mounts = [ "etc" "var" ];
+  deployment = {
+    # needs to keep just its ssh key for sops-nix
+    persistedShares = [ "/etc" "/var" ];
+    mem = 1024;
   };
-  microvm.mem = 1024;
 
   networking = {
     hostName = "gnunet";
diff --git a/hosts/radiobert/default.nix b/hosts/radiobert/default.nix
index 7112a66f..69085379 100644
--- a/hosts/radiobert/default.nix
+++ b/hosts/radiobert/default.nix
@@ -26,14 +26,13 @@
 
   boot = {
     loader = {
+      # generates entry for u-boot
+      generic-extlinux-compatible.enable = true;
       grub.enable = false;
       raspberryPi = {
-        enable = true;
+        # don't use rpi bootloader shit
+        enable = false;
         version = 4;
-        # TODO: this machine actually has u-boot setup but that's no
-        # longer working with nixos-22.05. DO NOT REBOOT! :-)
-        # https://github.com/NixOS/nixpkgs/pull/112677
-        # uboot.enable = true;
         firmwareConfig = ''
           gpu_mem=192
           dtparam=audio=on
@@ -131,5 +130,14 @@
     '';
   };
 
+  systemd.extraConfig = ''
+    # Keep cores 2-3 exclusive for SDR processing
+    CPUAffinity=0-1
+  '';
+  systemd.services = {
+    soapysdr-server.serviceConfig.CPUAffinity = "2-2";
+    readsdb.serviceConfig.CPUAffinity = "3-3";
+  };
+
   system.stateVersion = "21.05"; # Did you read the comment?
 }
diff --git a/modules/cluster/deployment.nix b/modules/cluster/deployment.nix
index 2845d234..88de08f1 100644
--- a/modules/cluster/deployment.nix
+++ b/modules/cluster/deployment.nix
@@ -50,11 +50,11 @@ in
       tag = builtins.replaceStrings [ "/" ] [ "-" ] (
         withoutLeadingSlash mountPoint
       );
-      source = "/storage/glusterfs/microvms/${user}/${repo}/${vmName}/${withoutLeadingSlash mountPoint}";
+      source = "/glusterfs/fast/microvms/${user}/${repo}/${vmName}/${withoutLeadingSlash mountPoint}";
       inherit mountPoint;
     }) config.deployment.persistedShares;
     # volumes = [ {
-    #   image = "/storage/glusterfs/microvms/${user}/${repo}/${vmName}/overlay.img";
+    #   image = "/glusterfs/fast/microvms/${user}/${repo}/${vmName}/overlay.img";
     #   mountPoint = "/";
     #   size = 8 * 1024;
     # } ];