diff --git a/kernel-open/nvidia-peermem/nvidia-peermem.Kbuild b/kernel-open/nvidia-peermem/nvidia-peermem.Kbuild
index d2bcaf8d0..a12128f17 100644
--- a/kernel-open/nvidia-peermem/nvidia-peermem.Kbuild
+++ b/kernel-open/nvidia-peermem/nvidia-peermem.Kbuild
@@ -37,21 +37,17 @@ ifeq ($(ARCH), arm64)
     OFA_ARCH := aarch64
 else ifeq ($(ARCH), powerpc)
     OFA_ARCH := ppc64le
+else ifeq ($(ARCH), x86)
+    OFA_ARCH := x86_64
 else
     OFA_ARCH := $(ARCH)
 endif
 OFA_DIR := /usr/src/ofa_kernel
-OFA_CANDIDATES = $(OFA_DIR)/$(OFA_ARCH)/$(KERNELRELEASE) $(OFA_DIR)/$(KERNELRELEASE) $(OFA_DIR)/default /var/lib/dkms/mlnx-ofed-kernel
-MLNX_OFED_KERNEL := $(shell for d in $(OFA_CANDIDATES); do \
-                              if [ -d "$$d" ]; then \
-                                echo "$$d"; \
-                                exit 0; \
-                              fi; \
-                            done; \
-                            echo $(OFA_DIR) \
-                     )
+OFA_DKMS_DIR := $(OFA_DIR)-dkms
+OFA_CANDIDATES = $(OFA_DKMS_DIR)/$(OFA_ARCH)/$(KERNELRELEASE) $(OFA_DIR)/$(OFA_ARCH)/$(KERNELRELEASE) $(OFA_DIR)/$(KERNELRELEASE) $(OFA_DIR)/default
+MLNX_OFED_KERNEL := $(firstword $(wildcard $(OFA_CANDIDATES)))
 
-ifneq ($(shell test -d $(MLNX_OFED_KERNEL) && echo "true" || echo "" ),)
+ifneq ($(MLNX_OFED_KERNEL),)
     NVIDIA_PEERMEM_CFLAGS += -I$(MLNX_OFED_KERNEL)/include -I$(MLNX_OFED_KERNEL)/include/rdma
     KBUILD_EXTRA_SYMBOLS := $(MLNX_OFED_KERNEL)/Module.symvers
 endif