diff --git a/build/builder_unix.go b/build/builder_unix.go
index 1e099e337..cd50632dd 100644
--- a/build/builder_unix.go
+++ b/build/builder_unix.go
@@ -19,10 +19,11 @@ package build
 
 import (
 	"os"
-	"syscall"
+
+	"golang.org/x/sys/unix"
 )
 
 func init() {
-	umask = os.FileMode(syscall.Umask(0))
-	syscall.Umask(int(umask))
+	umask = os.FileMode(unix.Umask(0))
+	unix.Umask(int(umask))
 }
diff --git a/cmd/zoekt-sourcegraph-indexserver/main.go b/cmd/zoekt-sourcegraph-indexserver/main.go
index dc20da73a..9422cd1a2 100644
--- a/cmd/zoekt-sourcegraph-indexserver/main.go
+++ b/cmd/zoekt-sourcegraph-indexserver/main.go
@@ -27,10 +27,11 @@ import (
 	"strconv"
 	"strings"
 	"sync"
-	"syscall"
 	"text/tabwriter"
 	"time"
 
+	"golang.org/x/sys/unix"
+
 	"github.com/keegancsmith/tmpfriend"
 	"github.com/peterbourgon/ff/v3/ffcli"
 	"github.com/prometheus/client_golang/prometheus"
@@ -247,7 +248,7 @@ func (s *Server) loggedRun(tr trace.Trace, cmd *exec.Cmd) (err error) {
 			} else {
 				// Send quit (C-\) first so we get a stack dump.
 				log.Printf("no output for %s, quitting %s", noOutputTimeout, cmd.Args)
-				if err := cmd.Process.Signal(syscall.SIGQUIT); err != nil {
+				if err := cmd.Process.Signal(unix.SIGQUIT); err != nil {
 					log.Println("quit failed:", err)
 				}
 
@@ -312,7 +313,7 @@ func (s *Server) Run() {
 		// testing we also listen for SIGUSR1 to trigger updates.
 		//
 		// "pkill -SIGUSR1 zoekt-sourcegra"
-		for range jitterTicker(s.Interval, syscall.SIGUSR1) {
+		for range jitterTicker(s.Interval, unix.SIGUSR1) {
 			if b, err := os.ReadFile(filepath.Join(s.IndexDir, pauseFileName)); err == nil {
 				log.Printf("indexserver manually paused via PAUSE file: %s", string(bytes.TrimSpace(b)))
 				continue
@@ -359,7 +360,7 @@ func (s *Server) Run() {
 	}()
 
 	go func() {
-		for range jitterTicker(s.VacuumInterval, syscall.SIGUSR1) {
+		for range jitterTicker(s.VacuumInterval, unix.SIGUSR1) {
 			if s.shardMerging {
 				s.vacuum()
 			}
@@ -367,7 +368,7 @@ func (s *Server) Run() {
 	}()
 
 	go func() {
-		for range jitterTicker(s.MergeInterval, syscall.SIGUSR1) {
+		for range jitterTicker(s.MergeInterval, unix.SIGUSR1) {
 			if s.shardMerging {
 				s.doMerge()
 			}
diff --git a/cmd/zoekt-sourcegraph-indexserver/meta.go b/cmd/zoekt-sourcegraph-indexserver/meta.go
index d6af31e8f..f3740710d 100644
--- a/cmd/zoekt-sourcegraph-indexserver/meta.go
+++ b/cmd/zoekt-sourcegraph-indexserver/meta.go
@@ -5,7 +5,8 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
-	"syscall"
+
+	"golang.org/x/sys/unix"
 
 	"github.com/sourcegraph/zoekt"
 	"github.com/sourcegraph/zoekt/build"
@@ -113,6 +114,6 @@ func jsonMarshalTmpFile(v interface{}, p string) (_ string, err error) {
 var umask os.FileMode
 
 func init() {
-	umask = os.FileMode(syscall.Umask(0))
-	syscall.Umask(int(umask))
+	umask = os.FileMode(unix.Umask(0))
+	unix.Umask(int(umask))
 }
diff --git a/cmd/zoekt-webserver/main.go b/cmd/zoekt-webserver/main.go
index 9717f7311..d8e15c7d4 100644
--- a/cmd/zoekt-webserver/main.go
+++ b/cmd/zoekt-webserver/main.go
@@ -36,9 +36,10 @@ import (
 	"runtime"
 	"strconv"
 	"strings"
-	"syscall"
 	"time"
 
+	"golang.org/x/sys/unix"
+
 	"github.com/sourcegraph/mountinfo"
 
 	"github.com/sourcegraph/zoekt"
@@ -337,7 +338,7 @@ func addProxyHandler(mux *http.ServeMux, socket string) {
 func shutdownSignalChan(maxReads int) <-chan os.Signal {
 	c := make(chan os.Signal, maxReads)
 	signal.Notify(c, os.Interrupt)    // terminal C-c and goreman
-	signal.Notify(c, syscall.SIGTERM) // Kubernetes
+	signal.Notify(c, unix.SIGTERM) // Kubernetes
 	return c
 }
 
@@ -442,8 +443,8 @@ func mustRegisterDiskMonitor(path string) {
 		Help:        "Amount of free space disk space.",
 		ConstLabels: prometheus.Labels{"path": path},
 	}, func() float64 {
-		var stat syscall.Statfs_t
-		_ = syscall.Statfs(path, &stat)
+		var stat unix.Statfs_t
+		_ = unix.Statfs(path, &stat)
 		return float64(stat.Bavail * uint64(stat.Bsize))
 	}))
 
@@ -452,8 +453,8 @@ func mustRegisterDiskMonitor(path string) {
 		Help:        "Amount of total disk space.",
 		ConstLabels: prometheus.Labels{"path": path},
 	}, func() float64 {
-		var stat syscall.Statfs_t
-		_ = syscall.Statfs(path, &stat)
+		var stat unix.Statfs_t
+		_ = unix.Statfs(path, &stat)
 		return float64(stat.Blocks * uint64(stat.Bsize))
 	}))
 }
diff --git a/indexfile_unix.go b/indexfile_unix.go
index 5cdf312e7..fea4fae76 100644
--- a/indexfile_unix.go
+++ b/indexfile_unix.go
@@ -20,7 +20,8 @@ import (
 	"fmt"
 	"log"
 	"os"
-	"syscall"
+
+	"golang.org/x/sys/unix"
 )
 
 type mmapedIndexFile struct {
@@ -45,7 +46,7 @@ func (f *mmapedIndexFile) Size() (uint32, error) {
 }
 
 func (f *mmapedIndexFile) Close() {
-	if err := syscall.Munmap(f.data); err != nil {
+	if err := unix.Munmap(f.data); err != nil {
 		log.Printf("WARN failed to Munmap %s: %v", f.name, err)
 	}
 }
@@ -70,7 +71,7 @@ func NewIndexFile(f *os.File) (IndexFile, error) {
 	}
 
 	rounded := (r.size + 4095) &^ 4095
-	r.data, err = syscall.Mmap(int(f.Fd()), 0, int(rounded), syscall.PROT_READ, syscall.MAP_SHARED)
+	r.data, err = unix.Mmap(int(f.Fd()), 0, int(rounded), unix.PROT_READ, unix.MAP_SHARED)
 	if err != nil {
 		return nil, err
 	}
diff --git a/tombstones.go b/tombstones.go
index beb001e04..febe3d101 100644
--- a/tombstones.go
+++ b/tombstones.go
@@ -6,7 +6,8 @@ import (
 	"os"
 	"path/filepath"
 	"strconv"
-	"syscall"
+
+	"golang.org/x/sys/unix"
 )
 
 // ShardMergingEnabled returns true if SRC_ENABLE_SHARD_MERGING is set to true.
@@ -104,6 +105,6 @@ func JsonMarshalRepoMetaTemp(shardPath string, repositoryMetadata interface{}) (
 var umask os.FileMode
 
 func init() {
-	umask = os.FileMode(syscall.Umask(0))
-	syscall.Umask(int(umask))
+	umask = os.FileMode(unix.Umask(0))
+	unix.Umask(int(umask))
 }