diff --git a/.github/workflows/swiftshader.yml b/.github/workflows/swiftshader.yml
index 374ddd5..e381989 100644
--- a/.github/workflows/swiftshader.yml
+++ b/.github/workflows/swiftshader.yml
@@ -9,12 +9,9 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  # Ideally use a commit that's verified to work well elsewhere (Arch
-  # swiftshader-git package, for example)
-  COMMIT: a6940c8e6eb0c61c433ed4b61ae04c12ff37bfbb
-  # This one includes a fix for building on ARM64 on macOS, and hopefully
-  # doesn't cause any other breakage
-  COMMIT_MAC: 14dcbed947ce755af1fcbfb3ba8e643b4e769860
+  # This one includes a fix for building on ARM64 on macOS, and seems to fix
+  # various other bugs
+  COMMIT: 14dcbed947ce755af1fcbfb3ba8e643b4e769860
 
 # Mostly just copied from here, with ES1 disabled:
 # https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=swiftshader-git
@@ -36,7 +33,7 @@ jobs:
       # default?!)
       run: |
         apt update
-        apt install -y ninja-build libx11-dev wget g++ software-properties-common
+        apt install -y ninja-build libx11-dev libxext-dev wget g++ software-properties-common
     - name: Install a newer Git version from a PPA
       # The actions/checkout FOR SOME REASON requires Git 2.18+, while 18.04
       # ships only with 2.17. Ultimately that means the "clones" are not
@@ -152,7 +149,7 @@ jobs:
       # default?!)
       run: |
         apt update
-        apt install -y ninja-build libx11-dev wget g++ software-properties-common
+        apt install -y ninja-build libx11-dev libxext-dev wget g++ software-properties-common
     - name: Install a newer Git version from a PPA
       # The actions/checkout FOR SOME REASON requires Git 2.18+, while 18.04
       # ships only with 2.17. Ultimately that means the "clones" are not
@@ -235,7 +232,7 @@ jobs:
       uses: actions/checkout@v4.1.7
       with:
         repository: google/swiftshader
-        ref: ${{ env.COMMIT_MAC }}
+        ref: ${{ env.COMMIT }}
         path: swiftshader
         # Yeah, I know, but the repo has no tags, and we use number of commits
         # for SWIFTSHADER_VERSION.