diff --git a/modules/hardware/surface-pro6.nix b/modules/hardware/surface-pro6.nix
index d2a3bf2..42ad76a 100644
--- a/modules/hardware/surface-pro6.nix
+++ b/modules/hardware/surface-pro6.nix
@@ -117,15 +117,20 @@ in {
         SURFACE_GPE m
         SURFACE_BOOK1_DGPU_SWITCH m
 
-	#
-	# Other
-	#
-	PINCTRL_INTEL y
-	PINCTRL_SUNRISEPOINT y
-	SERIAL_DEV_BUS y
-	SERIAL_DEV_CTRL_TTYPORT y
-	MFD_INTEL_LPSS_PCI y
-	INTEL_IDMA64 y
+        #
+        # Other
+        #
+        # Prevent a non-fatal "kernel oops" at boot crashing udev
+        # (https://github.com/linux-surface/linux-surface/issues/61#issuecomment-579298172)
+        PINCTRL_INTEL y
+        PINCTRL_SUNRISEPOINT y
+        # TODO: Possibly not needed
+        # More kernel options for the SAM module
+        # (https://github.com/linux-surface/surface-aggregator-module/wiki/Testing-and-Installing)
+        SERIAL_DEV_BUS y
+        SERIAL_DEV_CTRL_TTYPORT y
+        MFD_INTEL_LPSS_PCI y
+        INTEL_IDMA64 y
       '';
       }
     ];