Get default entity ID determination working on Linux again