diff --git a/flake.nix b/flake.nix
index de3e481..6d5c602 100755
--- a/flake.nix
+++ b/flake.nix
@@ -23,7 +23,6 @@
       url = "github:nvmd/nixos-raspberrypi/v1.20260317.0";
       inputs.nixpkgs.follows = "nixos-uconsole/nixpkgs";
     };
-    self.submodules = true;
   };
 
   outputs = { self, nixpkgs, agenix, disko, lix, nixos-uconsole, nixos-raspberrypi, ... }@inputs:
@@ -92,18 +91,17 @@
             ];
           };
 
-          uConsole = nixos-raspberrypi.lib.nixosSystem {
+          uConsole = nixos-uconsole.lib.mkUConsoleSystem {
+            variant = "cm5";
             specialArgs = { inherit self keys paths inputs nixos-raspberrypi; };
             modules = [
               {
                 nixpkgs.overlays = overlays;
                 nixpkgs.config.allowUnfree = true;
-                nixpkgs.hostPlatform = "aarch64-linux";
-                # Use nixpkgs default nix — lix dev breaks with stable 25.11
-                # nix.package = lix.packages."aarch64-linux".default;
+                nixpkgs.config.permittedInsecurePackages = [
+                  "openclaw-2026.3.12"
+                ];
               }
-              nixos-raspberrypi.nixosModules.raspberry-pi-5.base
-              nixos-uconsole.nixosModules.uconsole-cm5
               disko.nixosModules.disko
               ./hosts/uConsole/configuration.nix
               ./hosts/uConsole/hardware-configuration.nix