refactor: simplify instance store wiring