How to enter church in the ground floor of a building

Hello all

I wanted to enter in JOSM a church located in the ground floor of a building.

If I label the building with building=residential and the church with building=church, JOSM gives me an error because of a building inside a building.

Best regards

maybe a Point amenity=place_of_worship within a closed way with building=… .
Maybe sometimes it is a good idea to distinguish between Form (a normal buildling) and function (place of worship at the ground floor.)

Thank you hfst

It seems the problem is solved. Watch the result here: http://www.openstreetmap.org/#map=19/43.25562/-2.91931

Now the building is labeled as:
building=residential
level=1 (just in case)
name=…

and the church is labeled as:
amenity=place_of_worship
level=0 (just in case)
name=…
(no building tag)

Both names and the cross are shown in the map.