diff --git a/lenovo/thinkpad/x230/common.nix b/lenovo/thinkpad/x230/common.nix
new file mode 100644
index 0000000..5867ab9
--- /dev/null
+++ b/lenovo/thinkpad/x230/common.nix
@@ -0,0 +1,8 @@
+{
+  imports = [
+    ../.
+    ../../../common/cpu/intel
+  ];
+
+  boot.kernelModules = [ "tpm-rng" ];
+}
diff --git a/lenovo/thinkpad/x230/coreboot/default.nix b/lenovo/thinkpad/x230/coreboot/default.nix
new file mode 100644
index 0000000..a1d4fb2
--- /dev/null
+++ b/lenovo/thinkpad/x230/coreboot/default.nix
@@ -0,0 +1,3 @@
+{
+  imports = [ ../common.nix ];
+}
diff --git a/lenovo/thinkpad/x230/default.nix b/lenovo/thinkpad/x230/default.nix
index 58b09f4..6adb1e0 100644
--- a/lenovo/thinkpad/x230/default.nix
+++ b/lenovo/thinkpad/x230/default.nix
@@ -1,19 +1,6 @@
-{ config, lib, pkgs, ... }:
-
 {
   imports = [
-    ../.
-    ../../../common/cpu/intel
+    ./common.nix
     ../../../common/pc/laptop/acpi_call.nix
   ];
-
-  boot = {
-    kernelModules = [
-      "tpm-rng"
-    ];
-  };
-
-  services.xserver.deviceSection = lib.mkDefault ''
-    Option "TearFree" "true"
-  '';
 }