Lighting artifacts on walls

I posted this as an answer, but since it doesn’t solve te problem completely, I’ll add it as a comment: adding a few supporting edges reduces the artifacts, but I still get some.