diff --git a/unified/BUILD.bazel b/unified/BUILD.bazel
index c30dbbdeee58..738a95b31552 100644
--- a/unified/BUILD.bazel
+++ b/unified/BUILD.bazel
@@ -1,6 +1,6 @@
 load("@rules_pkg//pkg:mappings.bzl", "pkg_filegroup")
+load("//misc/bazel:os.bzl", "codeql_platform_select")
 load("//misc/bazel:pkg.bzl", "codeql_pack", "codeql_pkg_files")
-load("//misc/bazel:utils.bzl", "select_os")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -41,12 +41,14 @@ codeql_pkg_files(
 
 codeql_pkg_files(
     name = "extractor-arch",
-    exes = select_os(
-        posix = ["//unified/extractor"],
-        windows = ["//unified/extractor-unsupported-os:extractor"],
-    ) + select_os(
-        linux = ["//unified/swift-syntax-rs:swift_runtime_libs"],
-        otherwise = [],
+    exes = codeql_platform_select(
+        linux64 = [
+            "//unified/extractor",
+            "//unified/swift-syntax-rs:swift_runtime_libs",
+        ],
+        linux_arm64 = ["//unified/extractor-unsupported-os:extractor"],
+        osx64 = ["//unified/extractor"],
+        win64 = ["//unified/extractor-unsupported-os:extractor"],
     ),
     prefix = "tools/{CODEQL_PLATFORM}",
 )
diff --git a/unified/extractor-unsupported-os/src/main.rs b/unified/extractor-unsupported-os/src/main.rs
index a59217a2c09d..f8d4da14845e 100644
--- a/unified/extractor-unsupported-os/src/main.rs
+++ b/unified/extractor-unsupported-os/src/main.rs
@@ -1,4 +1,4 @@
 fn main() {
-    eprintln!("Unsupported OS. Extraction is not currently supported on Windows.");
+    eprintln!("Unsupported OS. Extraction is not currently supported on this platform.");
     std::process::exit(1);
 }