diff --git a/framework/16-inch/common/default.nix b/framework/16-inch/common/default.nix
index 07e5162..7cef21a 100644
--- a/framework/16-inch/common/default.nix
+++ b/framework/16-inch/common/default.nix
@@ -30,10 +30,16 @@
   # Allow `services.libinput.touchpad.disableWhileTyping` to work correctly.
   # Set unconditionally because libinput can also be configured dynamically via
   # gsettings.
+  #
+  # This is extracted from the quirks file that is in the upstream libinput
+  # source.  Once we can assume everyone is on at least libinput 1.26.0, this
+  # local override file can be removed.
+  # https://gitlab.freedesktop.org/libinput/libinput/-/commit/566857bd98131009699c9ab6efc7af37afd43fd0
   environment.etc."libinput/local-overrides.quirks".text = ''
-    [Serial Keyboards]
+    [Framework Laptop 16 Keyboard Module]
+    MatchName=Framework Laptop 16 Keyboard Module*
     MatchUdevType=keyboard
-    MatchName=Framework Laptop 16 Keyboard Module - ANSI Keyboard
+    MatchDMIModalias=dmi:*svnFramework:pnLaptop16*
     AttrKeyboardIntegration=internal
   '';
 }