diff --git a/patches-4.14/keyboards_and_covers.patch b/patches-4.14/keyboards_and_covers.patch
index 62c672541..71cf2f11d 100644
--- a/patches-4.14/keyboards_and_covers.patch
+++ b/patches-4.14/keyboards_and_covers.patch
@@ -25,7 +25,7 @@ index ff539c0..d8cc7b2 100644
 +#define USB_DEVICE_ID_MS_SURFACE_BOOK		0x07cd
 +#define USB_DEVICE_ID_MS_SURFACE_BOOK_2		0x0922
 +#define USB_DEVICE_ID_MS_SURFACE_LAPTOP		0xf001
-+#define HID_DEVICE_ID_MS_SURFACE_LAPTOP		0x0064
++#define HID_DEVICE_ID_MS_SURFACE_LAPTOP		0xf001
 +#define USB_DEVICE_ID_MS_POWER_COVER		0x07da
  
  #define USB_VENDOR_ID_MOJO		0x8282
@@ -82,7 +82,7 @@ index 9e8c4d2..bd1b82e 100644
 +	/* Microsoft Surface Laptop */
 +	{ .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
 +		HID_DEVICE(BUS_I2C, HID_GROUP_ANY,
-+			USB_DEVICE_ID_MS_SURFACE_LAPTOP,
++			USB_VENDOR_ID_MICROSOFT,
 +			HID_DEVICE_ID_MS_SURFACE_LAPTOP) },
 +
 +	/* Microsoft Power Cover */
diff --git a/patches-4.15/keyboards_and_covers.patch b/patches-4.15/keyboards_and_covers.patch
index 9a41d2643..5518a88fb 100644
--- a/patches-4.15/keyboards_and_covers.patch
+++ b/patches-4.15/keyboards_and_covers.patch
@@ -25,7 +25,7 @@ index a0baa5b..3e03ced8 100644
 +#define USB_DEVICE_ID_MS_SURFACE_BOOK		0x07cd
 +#define USB_DEVICE_ID_MS_SURFACE_BOOK_2		0x0922
 +#define USB_DEVICE_ID_MS_SURFACE_LAPTOP		0xf001
-+#define HID_DEVICE_ID_MS_SURFACE_LAPTOP		0x0064
++#define HID_DEVICE_ID_MS_SURFACE_LAPTOP		0xf001
 +#define USB_DEVICE_ID_MS_POWER_COVER		0x07da
  
  #define USB_VENDOR_ID_MOJO		0x8282
@@ -82,7 +82,7 @@ index 65ea23b..00ce3be 100644
 +	/* Microsoft Surface Laptop */
 +	{ .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
 +		HID_DEVICE(BUS_I2C, HID_GROUP_ANY,
-+			USB_DEVICE_ID_MS_SURFACE_LAPTOP,
++			USB_VENDOR_ID_MICROSOFT,
 +			HID_DEVICE_ID_MS_SURFACE_LAPTOP) },
 +
 +	/* Microsoft Power Cover */