diff --git a/hosts/nix-surface.nix b/hosts/nix-surface.nix
index 88c80a8..ea460d0 100644
--- a/hosts/nix-surface.nix
+++ b/hosts/nix-surface.nix
@@ -21,6 +21,8 @@ in
     "boot.shell_on_fail"
     "udev.log_priority=3"
     "rd.systemd.show_status=auto"
+    "intel_ipu3_imgu"
+    "intel_ipu3_isys"
   ];
 
   boot.kernelPackages = lib.mkForce refKernelPackages;
diff --git a/sw-kiosk.nix b/sw-kiosk.nix
index 86c93fd..7dce2e1 100644
--- a/sw-kiosk.nix
+++ b/sw-kiosk.nix
@@ -56,7 +56,8 @@
   };
 
   i18n.inputMethod = {
-    enabled = "ibus";
+    type = "ibus";
+    enable = true;
     ibus.engines = [ pkgs.ibus-engines.m17n ];
   };
   
@@ -99,24 +100,6 @@
       ENV{ID_INPUT_KEY}="", ENV{ID_INPUT_KEYBOARD}=""
   '';
 
-  systemd.user.services."force-osk" = {
-    description = "Force-enable GNOME OSK after session init";
-    wantedBy = [ "graphical-session.target" ];
-    partOf   = [ "graphical-session.target" ];
-
-    unitConfig = {
-      After = [ "gnome-session-initialized.target" "graphical-session.target" ];
-    };
-
-    serviceConfig = {
-      ExecStart = ''
-	${pkgs.glib.bin}/bin/gsettings set \
-	  org.gnome.desktop.a11y.applications screen-keyboard-enabled true
-      '';
-      Type = "oneshot";
-    };
-  };
-
   systemd.user.services."chromium-kiosk" = {
     description = "Chromium kiosk";
     wantedBy = [ "graphical-session.target" ];
@@ -124,8 +107,9 @@
 
     serviceConfig = {
       ExecStart = ''
+	dconf reset /org/gnome/desktop/a11y/applications/screen-keyboard-enabled
         ${pkgs.chromium}/bin/chromium \
-          --enable-features=UseOzonePlatform \
+          --enable-features=UseOzonePlatform,WebRTCLibcamera,TouchpadOverscrollHistoryNavigation \
           --ozone-platform=wayland \
           --kiosk \
           --start-fullscreen \
@@ -159,6 +143,7 @@
     alsa.enable = true;
     alsa.support32Bit = true;
     pulse.enable = true;
+    wireplumber.enable = true;
   };
 
   # Allow unfree packages
@@ -168,6 +153,7 @@
   environment.systemPackages = with pkgs; [
     htop
     binutils
+    libcamera
     (chromium.override {
       commandLineArgs = [ "--enable-features=TouchpadOverscrollHistoryNavigation" ];
     })
@@ -179,17 +165,11 @@
     dconf
     phoc
     gsettings-desktop-schemas
-    #(pkgs.writeShellScriptBin "osk-wayland" ''
-    #  exec ${pkgs.squeekboard}/bin/squeekboard "$@"
-    #'')
     inputs.lazyvim-nixvim.packages.${stdenv.hostPlatform.system}.nvim
   ];
 
   programs.chromium = {
     enable = true;
-    extensions = [
-      # "ecjkcanpimnagobhegghdeeiagffoidk" # Chrome Virtual Keyboard
-    ];
   };
 
   programs.zsh.enable = true;