What house did Hemlock live in ...?

When I saw this film in Paris in 1975 Hemlock (C.E.) had his collection of paintings in a vault as is still shown. What has been removed is the actual house above the vault and it appears as if Hemlock and Jemiah Brown just enter, look at the vault and then go to bed.

I however seem to remember that the building was a one-time church with the living room where the altar had been. Outside, the coloured glass window behind the altar was lit up with spot lights and the rain running down the glass caused coloured patterns on the stone floor. It was the only spectacular thing in an otherwise semi-boring movie.

I've never seen this version again and have wondered if anybody else has?