diff --git a/machines/mimir/configuration.nix b/machines/mimir/configuration.nix
index 59ccdd4..69cb190 100644
--- a/machines/mimir/configuration.nix
+++ b/machines/mimir/configuration.nix
@@ -36,7 +36,6 @@
     base = {
       plymouth.enable = true;
       work = true;
-      kernel = pkgs.linuxKernel.packages.linux_6_2;
     };
 
     desktop = {
@@ -66,12 +65,15 @@
   };
 
   # Use the systemd-boot EFI boot loader.
-  boot.loader = {
-    systemd-boot = {
-      enable = true;
-      configurationLimit = 15;
+  boot = {
+    kernelPackages = pkgs.linuxPackages_6_2;
+    loader = {
+      systemd-boot = {
+        enable = true;
+        configurationLimit = 15;
+      };
+      efi.canTouchEfiVariables = true;
     };
-    efi.canTouchEfiVariables = true;
   };
 
   time.timeZone = "Europe/Amsterdam";
diff --git a/machines/regin/configuration.nix b/machines/regin/configuration.nix
index b7fc8d1..553bafa 100644
--- a/machines/regin/configuration.nix
+++ b/machines/regin/configuration.nix
@@ -7,6 +7,7 @@
 
     ../../users/root
     ../../users/erwin
+    ./home.nix
   ];
 
   eboskma = {
@@ -14,14 +15,13 @@
       enable = true;
       server = true;
     };
-    base.kernel = pkgs.linuxPackages_rpi4;
     klipper.enable = true;
     networking.enable = true;
     nix-common.enable = true;
     systemd.enable = true;
   };
 
-  users.users.erwin.initialHashedPassword = "$6$Tm4P3XjXJ/QrNaYW$7VqMt.AdQEtHXKjTWCJ3NVq1BiD.mx57skA3ZZrO7LgYnTM/jJLcD0CjWuED57IeGnKdBqYB1tFI5.J.UIVhR.";
+  # nixpkgs.crossSystem.system = "aarch64-linux";
 
   hardware = {
     enableAllFirmware = true; # This also sets hardware.enableRedistributableFirmware
@@ -33,6 +33,7 @@
 
   boot = {
     bootspec.enable = true;
+    kernelPackages = pkgs.linuxPackages_rpi4;
   };
 
   zramSwap.enable = true;
diff --git a/machines/thor/configuration.nix b/machines/thor/configuration.nix
index 4a0b410..f24b1cb 100644
--- a/machines/thor/configuration.nix
+++ b/machines/thor/configuration.nix
@@ -16,7 +16,6 @@
       enable = true;
     };
     base = {
-      kernel = pkgs.linuxKernel.packages.linux_rpi4;
       plymouth.enable = true;
     };
     desktop = {
@@ -41,12 +40,12 @@
     enableAllFirmware = true;
     raspberry-pi."4".fkms-3d = {
       enable = true;
-      cma = 256;
     };
   };
 
   boot = {
     bootspec.enable = true;
+    kernelPackages = pkgs.linuxPackages_rpi4;
   };
 
   zramSwap.enable = true;
diff --git a/modules/base/default.nix b/modules/base/default.nix
index 4b2ff5d..dc184d5 100644
--- a/modules/base/default.nix
+++ b/modules/base/default.nix
@@ -33,12 +33,6 @@ with lib; let
 in
 {
   options.eboskma.base = {
-    kernel = mkOption {
-      description = "which kernel to run";
-      type = types.unspecified;
-      default = pkgs.linuxPackages;
-    };
-
     plymouth = {
       enable = mkEnableOption "plymouth splash screen";
     };
@@ -59,8 +53,6 @@ in
   };
 
   config = {
-    boot.kernelPackages = cfg.kernel;
-
     boot.plymouth = mkIf cfg.plymouth.enable {
       enable = true;
       themePackages = [ plymouth-nixos-blur ];