diff --git a/lib/mycelium-network.nix b/lib/mycelium-network.nix
index a389537..cd2ceb3 100644
--- a/lib/mycelium-network.nix
+++ b/lib/mycelium-network.nix
@@ -2,7 +2,7 @@
   zaatar = "5c5:49e0:7793:f017:59e1:1715:9e0e:3fc8";
   fatteh = "463:a0d4:daa3:aa8d:a9b1:744a:46a5:7a80";
   ful = "5bf:d60e:bebf:5163:f495:8787:880c:6d41";
-  kibbeh = "432:e30:d5d8:9311:e34b:6587:96ee:3fcb";
+  kabsa = "432:e30:d5d8:9311:e34b:6587:96ee:3fcb";
   makanek = "43f:ad4f:fa67:d9f7:8a56:713c:7418:164b";
   manakish = "512:d3bd:3cd9:fcc8:ae34:81fa:385f:8c21";
 }
diff --git a/secrets b/secrets
index c622f9b..e14a317 160000
--- a/secrets
+++ b/secrets
@@ -1 +1 @@
-Subproject commit c622f9bac9d2ddfa86701d903aac02d8907b2142
+Subproject commit e14a3170cc8dca84f041c6d2583108da396aab58
diff --git a/systems/kabsa/configuration.nix b/systems/kabsa/configuration.nix
index 3440878..159debd 100644
--- a/systems/kabsa/configuration.nix
+++ b/systems/kabsa/configuration.nix
@@ -7,7 +7,7 @@
   inherit (import ../../lib) retiolumAddresses;
 in {
   imports = [
-    ./hardware-configuration.nix
+    ../kibbeh/hardware-configuration.nix
     ../../configs/tlp.nix
     ../../configs/default.nix
     ../../configs/networkmanager.nix
@@ -55,5 +55,5 @@ in {
     retiolum = retiolumAddresses.kabsa;
   };
 
-  system.stateVersion = "19.03";
+  system.stateVersion = "23.11";
 }
diff --git a/systems/kibbeh/configuration.nix b/systems/kibbeh/configuration.nix
index 7ce6c0e..099161f 100644
--- a/systems/kibbeh/configuration.nix
+++ b/systems/kibbeh/configuration.nix
@@ -42,14 +42,8 @@
   services.gnome.gnome-keyring.enable = true;
   security.pam.services.lightdm.enableGnomeKeyring = true;
 
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
   services.openssh.enable = true;
 
-  boot.initrd.luks.devices."luks-b3988d35-72a9-4e7c-992d-f500bb388554".device =
-    "/dev/disk/by-uuid/b3988d35-72a9-4e7c-992d-f500bb388554";
-
   networking.hostName = "kibbeh";
   networking.networkmanager.enable = true;
 
diff --git a/systems/kibbeh/hardware-configuration.nix b/systems/kibbeh/hardware-configuration.nix
index 7bdd853..bb072d5 100644
--- a/systems/kibbeh/hardware-configuration.nix
+++ b/systems/kibbeh/hardware-configuration.nix
@@ -1,42 +1,54 @@
-# 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 =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
 
-  boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
+  boot = {
+    initrd = {
+      availableKernelModules = [
+        "ehci_pci"
+        "ahci"
+        "usb_storage"
+        "sd_mod"
+        "sdhci_pci"
+      ];
+      luks.devices."luks-16a8b3b0-5e0a-4d36-920c-eb6322a3c181".device =
+        "/dev/disk/by-uuid/16a8b3b0-5e0a-4d36-920c-eb6322a3c181";
+      luks.devices."luks-b3988d35-72a9-4e7c-992d-f500bb388554".device =
+        "/dev/disk/by-uuid/b3988d35-72a9-4e7c-992d-f500bb388554";
+    };
+    kernelModules = [ "kvm-intel" ];
+    extraModulePackages = [ ];
+    loader = {
+      systemd-boot.enable = true;
+      efi.canTouchEfiVariables = true;
+    };
+  };
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/ecab6acb-66f1-41c9-8281-59c76cf8f0c6";
+  fileSystems = {
+    "/" = {
+      device = "/dev/disk/by-uuid/ecab6acb-66f1-41c9-8281-59c76cf8f0c6";
       fsType = "ext4";
     };
-
-  boot.initrd.luks.devices."luks-16a8b3b0-5e0a-4d36-920c-eb6322a3c181".device = "/dev/disk/by-uuid/16a8b3b0-5e0a-4d36-920c-eb6322a3c181";
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/8066-63C2";
+    "/boot" = {
+      device = "/dev/disk/by-uuid/8066-63C2";
       fsType = "vfat";
     };
+  };
 
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/8cebdb17-4f2e-4750-8e91-71aa942bdfde"; }
-    ];
+  swapDevices = [
+    { device = "/dev/disk/by-uuid/8cebdb17-4f2e-4750-8e91-71aa942bdfde"; }
+  ];
 
-  # 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
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp0s25.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wwp0s29u1u4i6.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;