diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
index 07412def3..68e8652fb 100644
--- a/.github/workflows/flatpak.yml
+++ b/.github/workflows/flatpak.yml
@@ -1,5 +1,4 @@
-on:
-  workflow_dispatch: {}
+on: [push]
 
 name: Flatpak
 
@@ -11,7 +10,10 @@ jobs:
       image: bilelmoussaoui/flatpak-github-actions:gnome-43
       options: --privileged
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
+      with:
+        submodules: recursive
+        fetch-depth: 0
     - uses: flatpak/flatpak-github-actions/flatpak-builder@v4
       with:
         bundle: ghostty.flatpak
diff --git a/.gitmodules b/.gitmodules
index 24bed8d5b..793dcf0a0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -40,3 +40,6 @@
 [submodule "vendor/libxev"]
 	path = vendor/libxev
 	url = https://github.com/mitchellh/libxev.git
+[submodule "vendor/mach-sdk/sdk-linux-x86_64"]
+	path = vendor/mach-sdk/sdk-linux-x86_64
+	url = https://github.com/hexops/sdk-linux-x86_64.git
diff --git a/build.zig b/build.zig
index 794d261b5..3032aa8d7 100644
--- a/build.zig
+++ b/build.zig
@@ -590,7 +590,11 @@ fn addDeps(
         // get access to glib for dbus.
         if (flatpak) {
             step.linkSystemLibrary("gtk4");
-            step.addLibraryPath("/usr/lib/aarch64-linux-gnu");
+            switch (step.target.getCpuArch()) {
+                .aarch64 => step.addLibraryPath("/usr/lib/aarch64-linux-gnu"),
+                .x86_64 => step.addLibraryPath("/usr/lib/x86_64-linux-gnu"),
+                else => @panic("unsupported flatpak target"),
+            }
         }
 
         switch (app_runtime) {
diff --git a/com.mitchellh.ghostty.yml b/com.mitchellh.ghostty.yml
index 730c36b86..ce360e6fa 100644
--- a/com.mitchellh.ghostty.yml
+++ b/com.mitchellh.ghostty.yml
@@ -2,8 +2,6 @@ app-id: com.mitchellh.ghostty
 runtime: org.gnome.Platform
 runtime-version: '43'
 sdk: org.gnome.Sdk
-platform-extensions:
-  - org.freedesktop.Platform.GL.default
 default-branch: tip
 command: ghostty
 build-options:
diff --git a/vendor/mach-sdk/sdk-linux-x86_64 b/vendor/mach-sdk/sdk-linux-x86_64
new file mode 160000
index 000000000..ebd1ce12e
--- /dev/null
+++ b/vendor/mach-sdk/sdk-linux-x86_64
@@ -0,0 +1 @@
+Subproject commit ebd1ce12e9abc152c7ed43afbcdb4b6e1c95be07