diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 9b52c3a..5c28297 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -46,8 +46,7 @@ jobs:
   lint-cpp:
     strategy:
       matrix:
-        # NOTE: There seem to be missing includes on ARM64
-        os: [ubuntu-latest, windows-latest, macos-14]
+        os: [ubuntu-latest, windows-latest, macos-latest]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
@@ -63,9 +62,12 @@ jobs:
         # Windows oddly requires C++20 support due to internal bugs.
         if [[ "${RUNNER_OS}" == "Windows" ]]; then
           extra_args="-extra-arg=-std=c++20"
+          passthrough=""
         elif [[ "${RUNNER_OS}" == "macOS" ]]; then
           extra_args="-extra-arg=-std=c++17 -extra-arg=--stdlib=libc++"
+          passthrough="--query-driver=/usr/bin/clang++"
         else
           extra_args="-extra-arg=-std=c++17"
+          passthrough=""
         fi
-        clang-tidy -checks=-*,clang-analyzer-*,-clang-analyzer-cplusplus* ${extra_args} example/breeze_theme.hpp --
+        clang-tidy -checks=-*,clang-analyzer-*,-clang-analyzer-cplusplus* ${extra_args} example/breeze_theme.hpp -- "${passthrough}"