Removing layer=* from the highway and tagging it as tunnel=building_passage should've been enough to resolve the issue, adding layer=1 to the building makes little sense to me: https://wiki.openstreetmap.org/wiki/Tag:tunnel%3Dbuilding_passage explicitly states that "The layer should be the same as the layer of the building ... if the building doesn't have a layer tag, the way should not have one either." Could you revise your change please?