diff --git a/common/cpu/intel/default.nix b/common/cpu/intel/default.nix
index e3ce919..84997f1 100644
--- a/common/cpu/intel/default.nix
+++ b/common/cpu/intel/default.nix
@@ -1,4 +1,12 @@
+{ lib, pkgs, ... }:
+
 {
-  hardware.cpu.intel.updateMicrocode = true;
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault true;
   services.xserver.videoDrivers = [ "intel" ];
+
+  hardware.opengl.extraPackages = with pkgs; [
+    vaapiIntel
+    vaapiVdpau
+    libvdpau-va-gl
+  ];
 }
diff --git a/lenovo/thinkpad/x230/default.nix b/lenovo/thinkpad/x230/default.nix
index daeda9e..913b526 100644
--- a/lenovo/thinkpad/x230/default.nix
+++ b/lenovo/thinkpad/x230/default.nix
@@ -1,24 +1,18 @@
 { config, lib, pkgs, ... }:
 
-with lib; {
+{
   imports = [
     ../.
     ../../../common/cpu/intel
   ];
 
   boot = {
+    extraModulePackages = with config.boot.kernelPackages; [
+      acpi_call
+    ];
     kernelModules = [
       "acpi_call"
       "tpm-rng"
     ];
-    extraModulePackages = with config.boot.kernelPackages; [
-      acpi_call
-    ];
   };
-
-  hardware.opengl.extraPackages = with pkgs; [
-    vaapiIntel
-    vaapiVdpau
-    libvdpau-va-gl
-  ];
 }