fix: Clean up snapper id reference passing