Linting cleanups; cleanup is-object-id