diff --git a/.circleci/config.yml b/.circleci/config.yml
index b2340c836..468812ccc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -265,10 +265,10 @@ jobs:
       - prepare
       - run: cd extern/oni && git submodule sync
       - run: cd extern/oni && git submodule update --init
-      - run: cd extern/oni/extra/filecoin-ffi && make
+      - run: cd extern/filecoin-ffi && make
       - run:
-          name: "update lotus-soup dependency to lotus"
-          command: pushd extern/oni/lotus-soup && echo 'replace github.com/filecoin-project/lotus => ../../../' >> go.mod
+          name: "replace lotus and filecoin-ffi deps"
+          command: pushd extern/oni/lotus-soup && go mod edit -replace github.com/filecoin-project/lotus=../../../ && go mod edit -replace github.com/filecoin-project/filecoin-ffi=../../filecoin-ffi
       - run:
           name: "build lotus-soup testplan"
           command: pushd extern/oni/lotus-soup && go build -tags=testground .
diff --git a/extern/oni b/extern/oni
index d9bcdfe61..097d82535 160000
--- a/extern/oni
+++ b/extern/oni
@@ -1 +1 @@
-Subproject commit d9bcdfe61b89f00bef07f6d3995e36e277930acd
+Subproject commit 097d82535de690160fb84e97d0baf1bd04e175c6