diff --git a/systems/aarch64-linux/m4nix/default.nix b/systems/aarch64-linux/m4nix/default.nix
index e0fc1e7..f8ea911 100644
--- a/systems/aarch64-linux/m4nix/default.nix
+++ b/systems/aarch64-linux/m4nix/default.nix
@@ -55,8 +55,6 @@ with lib.metacfg;
     piper
     gnome-remote-desktop
     nodejs
-    cachix
-    claude-code
   ];
 
   security.tpm2.enable = false;
@@ -82,7 +80,5 @@ with lib.metacfg;
     allowReboot = false;
   };
 
-  virtualisation.rosetta.enable = true;
-
-  system.stateVersion = "25.05";
+  system.stateVersion = "23.11";
 }
diff --git a/systems/aarch64-linux/m4nix/hardware-configuration.nix b/systems/aarch64-linux/m4nix/hardware-configuration.nix
index 273ccfe..7243378 100644
--- a/systems/aarch64-linux/m4nix/hardware-configuration.nix
+++ b/systems/aarch64-linux/m4nix/hardware-configuration.nix
@@ -1,30 +1,39 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:
 
 {
   imports = [ ];
 
-  boot.initrd.availableKernelModules = [ "virtio_pci" "xhci_pci" "usbhid" "usb_storage" ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/069a5103-100e-4ff0-9f25-58df709cfd4e";
-      fsType = "ext4";
-    };
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/b340000f-2927-414d-9382-edd3120b8e80";
+    fsType = "ext4";
+  };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/8C85-EB75";
-      fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
-    };
-
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/08bbaeb8-8610-4592-9393-938c45ec4d19"; }
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/16C0-5FB0";
+    fsType = "vfat";
+    options = [
+      "fmask=0077"
+      "dmask=0077"
     ];
+  };
+
+  swapDevices = [
+    { device = "/dev/disk/by-uuid/76cc3afa-b57e-4f25-95f4-7b15bf1fb796"; }
+  ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
diff --git a/systems/aarch64-linux/rnix/default.nix b/systems/aarch64-linux/rnix/default.nix
index e0fc1e7..025daa8 100644
--- a/systems/aarch64-linux/rnix/default.nix
+++ b/systems/aarch64-linux/rnix/default.nix
@@ -84,5 +84,5 @@ with lib.metacfg;
 
   virtualisation.rosetta.enable = true;
 
-  system.stateVersion = "25.05";
+  system.stateVersion = "23.11";
 }