diff --git a/ci.nix b/ci.nix
index 930fde82..930209b9 100644
--- a/ci.nix
+++ b/ci.nix
@@ -63,6 +63,7 @@ in
       xo-pywebsock
       xo-process
       xo-pyprocess
+      xo-statistics
       xo-userenv
       ;
   }
diff --git a/xo-statistics/cmake/xo-bootstrap-macros.cmake b/xo-statistics/cmake/xo-bootstrap-macros.cmake
index aba31169..592272c0 100644
--- a/xo-statistics/cmake/xo-bootstrap-macros.cmake
+++ b/xo-statistics/cmake/xo-bootstrap-macros.cmake
@@ -19,7 +19,13 @@ endif()
 
 message(STATUS "XO_CMAKE_CONFIG_EXECUTABLE=${XO_CMAKE_CONFIG_EXECUTABLE}")
 
-if (NOT XO_SUBMODULE_BUILD)
+if (XO_SUBMODULE_BUILD)
+    if (("${CMAKE_MODULE_PATH}" STREQUAL "") OR ("${CMAKE_MODULE_PATH}" STREQUAL prefix))
+        # local version of xo-cmake macros
+        set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/xo-cmake/cmake")
+        message(STATUS "CMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}")
+    endif()
+else()
     if (("${CMAKE_MODULE_PATH}" STREQUAL "") OR ("${CMAKE_MODULE_PATH}" STREQUAL prefix))
         # default to typical install location for xo-project-macros
         execute_process(COMMAND ${XO_CMAKE_CONFIG_EXECUTABLE} --cmake-module-path OUTPUT_VARIABLE CMAKE_MODULE_PATH)
diff --git a/xo.nix b/xo.nix
index 4d6295d7..87489916 100644
--- a/xo.nix
+++ b/xo.nix
@@ -76,7 +76,7 @@ let
     xo-pyprocess      = callPackage pkgs/xo-pyprocess.nix      { stdenv = jitStdenv; };
     xo-websock        = callPackage pkgs/xo-websock.nix        { stdenv = jitStdenv; };
     xo-pywebsock      = callPackage pkgs/xo-pywebsock.nix      { stdenv = jitStdenv; };
-    xo-statistics     = callPackage pkgs/xo-statistics.nix     {};
+    xo-statistics     = callPackage pkgs/xo-statistics.nix     { stdenv = jitStdenv; };
     xo-distribution   = callPackage pkgs/xo-distribution.nix   {};
     xo-pydistribution = callPackage pkgs/xo-pydistribution.nix {};
     xo-kalmanfilter   = callPackage pkgs/xo-kalmanfilter.nix   {};