diff --git a/microsoft/surface/kernel/default.nix b/microsoft/surface/kernel/default.nix
index 2a17bbb..74293ff 100644
--- a/microsoft/surface/kernel/default.nix
+++ b/microsoft/surface/kernel/default.nix
@@ -33,9 +33,5 @@ let
   );
 
 in {
-<<<<<<< Updated upstream
-  boot.kernelPackages = linux-5_19_17;
-=======
   boot.kernelPackages = linux-6_0_11;
->>>>>>> Stashed changes
 }
diff --git a/microsoft/surface/kernel/linux-6.0.11.nix b/microsoft/surface/kernel/linux-6.0.11.nix
index 6cfd457..1eb2f84 100644
--- a/microsoft/surface/kernel/linux-6.0.11.nix
+++ b/microsoft/surface/kernel/linux-6.0.11.nix
@@ -22,6 +22,71 @@ in {
       name = "microsoft-surface-patches-linux-${version}";
       patch = null;
       structuredExtraConfig = with lib.kernel; {
+        #
+        # Surface Aggregator Module
+        #
+        CONFIG_SURFACE_AGGREGATOR = module;
+        CONFIG_SURFACE_AGGREGATOR_ERROR_INJECTION = no;
+        CONFIG_SURFACE_AGGREGATOR_BUS = yes;
+        CONFIG_SURFACE_AGGREGATOR_CDEV = module;
+        CONFIG_SURFACE_AGGREGATOR_HUB = module;
+        CONFIG_SURFACE_AGGREGATOR_REGISTRY = module;
+        CONFIG_SURFACE_AGGREGATOR_TABLET_SWITCH = module;
+
+        CONFIG_SURFACE_ACPI_NOTIFY = module;
+        CONFIG_SURFACE_DTX = module;
+        CONFIG_SURFACE_PLATFORM_PROFILE = module;
+
+        CONFIG_SURFACE_HID = module;
+        CONFIG_SURFACE_KBD = module;
+
+        CONFIG_BATTERY_SURFACE = module;
+        CONFIG_CHARGER_SURFACE = module;
+
+        #
+        # Surface Hotplug
+        #
+        CONFIG_SURFACE_HOTPLUG = module;
+
+        #
+        # IPTS touchscreen
+        #
+        # This only enables the user interface for IPTS data.
+        # For the touchscreen to work, you need to install iptsd.
+        #
+        CONFIG_MISC_IPTS = module;
+
+        #
+        # Cameras: IPU3
+        #
+        CONFIG_VIDEO_DW9719 = module;
+        CONFIG_VIDEO_IPU3_IMGU = module;
+        CONFIG_VIDEO_IPU3_CIO2 = module;
+        CONFIG_CIO2_BRIDGE = yes;
+        CONFIG_INTEL_SKL_INT3472 = module;
+        CONFIG_REGULATOR_TPS68470 = module;
+        CONFIG_COMMON_CLK_TPS68470 = module;
+
+        #
+        # Cameras: Sensor drivers
+        #
+        CONFIG_VIDEO_OV5693 = module;
+        CONFIG_VIDEO_OV7251 = module;
+        CONFIG_VIDEO_OV8865 = module;
+
+        #
+        # ALS Sensor for Surface Book 3, Surface Laptop 3, Surface Pro 7
+        #
+        CONFIG_APDS9960 = module;
+
+        #
+        # Other Drivers
+        #
+        CONFIG_INPUT_SOC_BUTTON_ARRAY = module;
+        CONFIG_SURFACE_3_POWER_OPREGION = module;
+        CONFIG_SURFACE_PRO3_BUTTON = module;
+        CONFIG_SURFACE_GPE = module;
+        CONFIG_SURFACE_BOOK1_DGPU_SWITCH = module;
       };
     }
     {