diff --git a/systems/x86_64-linux/t15/hardware-configuration.nix b/systems/x86_64-linux/t15/hardware-configuration.nix
index d538c9e..a2f8f80 100644
--- a/systems/x86_64-linux/t15/hardware-configuration.nix
+++ b/systems/x86_64-linux/t15/hardware-configuration.nix
@@ -5,13 +5,20 @@
   config,
   lib,
   pkgs,
-  modulesPath,
+  inputs,
   ...
 }:
 
 {
-  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+  imports = [
+    "${inputs.nixos-hardware}/common/cpu/intel/tiger-lake"
+    "${inputs.nixos-hardware}/common/gpu/intel/tiger-lake"
+    "${inputs.nixos-hardware}/common/pc/laptop"
+    "${inputs.nixos-hardware}/common/pc/ssd"
+    "${inputs.nixos-hardware}/common/pc"
+  ];
 
+  kernelPackages = lib.mkOverride 0 pkgs.linuxPackages_latest;
   boot.kernelModules = [ "kvm-intel" ];
   boot.initrd.availableKernelModules = [
     "ahci"
diff --git a/systems/x86_64-linux/x1/default.nix b/systems/x86_64-linux/x1/default.nix
index 458dd75..8c67e36 100644
--- a/systems/x86_64-linux/x1/default.nix
+++ b/systems/x86_64-linux/x1/default.nix
@@ -143,12 +143,14 @@ with lib.metacfg;
     };
   };
 
-  environment.sessionVariables = {
-    LIBVA_DRIVER_NAME = "iHD";
-    # NIXOS_OZONE_WL = "1";
-    # DRI_PRIME = "pci-0000_24_00_0";
-    DRI_PRIME = "pci-0000_00_02_0";
-  };
+  /*
+    environment.sessionVariables = {
+      LIBVA_DRIVER_NAME = "iHD";
+      # NIXOS_OZONE_WL = "1";
+      # DRI_PRIME = "pci-0000_24_00_0";
+      DRI_PRIME = "pci-0000_00_02_0";
+    };
+  */
 
   system.stateVersion = "23.11";
 }